From f58f55cd68fdbcd0491d4d8835421bfe97d6acb1 Mon Sep 17 00:00:00 2001 From: Andreas Butti Date: Fri, 30 Nov 2018 21:33:44 +0100 Subject: [PATCH 1/2] Fixed GTK Deprecated methods --- src/gui/dialog/ButtonConfigGui.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/gui/dialog/ButtonConfigGui.cpp b/src/gui/dialog/ButtonConfigGui.cpp index f68f5e53..aa2ccbd9 100644 --- a/src/gui/dialog/ButtonConfigGui.cpp +++ b/src/gui/dialog/ButtonConfigGui.cpp @@ -7,6 +7,7 @@ #include #include +#include #define ADD_TYPE_CB(icon, name, action) \ gtk_list_store_append(typeModel, &iter); \ @@ -166,12 +167,10 @@ void ButtonConfigGui::loadSettings() gtk_combo_box_set_active(GTK_COMBO_BOX(cbThickness), 0); } - GdkColor color = {0, 0, 0, 0}; - color.red = (cfg->color >> 8) & 0xff00; - color.green = (cfg->color >> 0) & 0xff00; - color.blue = (cfg->color << 8) & 0xff00; - gtk_color_button_set_color(GTK_COLOR_BUTTON(colorButton), &color); + GdkRGBA color; + Util::apply_rgb_togdkrgba(color, cfg->color); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(colorButton), &color); gtk_combo_box_set_active(GTK_COMBO_BOX(this->cbDrawingType), cfg->drawingType); @@ -255,10 +254,9 @@ void ButtonConfigGui::saveSettings() cfg->size = TOOL_SIZE_NONE; } - GdkColor color = {0, 0, 0, 0}; - gtk_color_button_get_color(GTK_COLOR_BUTTON(colorButton), &color); - - cfg->color = (color.red / 256) << 16 | (color.green / 256) << 8 | (color.blue / 256); + GdkRGBA color; + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(colorButton), &color); + cfg->color = Util::gdkrgba_to_hex(color); cfg->drawingType = (DrawingType) gtk_combo_box_get_active(GTK_COMBO_BOX(this->cbDrawingType)); From 3ced10f94363c1e6d057e00622845f44e7e4c6cf Mon Sep 17 00:00:00 2001 From: Andreas Butti Date: Fri, 30 Nov 2018 21:37:18 +0100 Subject: [PATCH 2/2] Fixed touch device selection menu #412 --- src/gui/dialog/ButtonConfigGui.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/dialog/ButtonConfigGui.cpp b/src/gui/dialog/ButtonConfigGui.cpp index aa2ccbd9..9b1e85a1 100644 --- a/src/gui/dialog/ButtonConfigGui.cpp +++ b/src/gui/dialog/ButtonConfigGui.cpp @@ -206,6 +206,8 @@ void ButtonConfigGui::loadSettings() gtk_combo_box_set_active(GTK_COMBO_BOX(cbDevice), i + 1); break; } + + i++; } gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbDisableDrawing), cfg->disableDrawing);