diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2017-06-28 19:37:48 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2017-06-28 19:37:48 +0000 |
| commit | 591ff2f2e45958c0c92f29a674691259be67d691 (patch) | |
| tree | afa8ff42c59222e3d47ccae43f2bb9d91228186e /src/widgets | |
| parent | contextmenu: Rm icons per GNOME HIG (diff) | |
| download | inkscape-591ff2f2e45958c0c92f29a674691259be67d691.tar.gz inkscape-591ff2f2e45958c0c92f29a674691259be67d691.zip | |
Revert "color wheel: Temp fix for Gtk+ style properties"
This reverts commit c951edaa91414fd5dfddb745de49baf777f72075.
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/gimp/gimpcolorwheel.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/widgets/gimp/gimpcolorwheel.c b/src/widgets/gimp/gimpcolorwheel.c index 351201121..212391497 100644 --- a/src/widgets/gimp/gimpcolorwheel.c +++ b/src/widgets/gimp/gimpcolorwheel.c @@ -307,20 +307,6 @@ gimp_color_wheel_get_preferred_width (GtkWidget *widget, gint *minimum_width, gint *natural_width) { -// TODO: Sync this fix with the upstream GIMP code when available -#if GTK_CHECK_VERSION(3,14,0) - gint outline_width; - gint padding; - gint outline_offset; - - gtk_widget_style_get (widget, - "outline-width", &outline_width, - "padding", &padding, - "outline-offset", &outline_offset, - NULL); - - *minimum_width = *natural_width = DEFAULT_SIZE + 2 * (outline_width + padding + outline_offset); -#else gint focus_width; gint focus_pad; @@ -330,7 +316,6 @@ gimp_color_wheel_get_preferred_width (GtkWidget *widget, NULL); *minimum_width = *natural_width = DEFAULT_SIZE + 2 * (focus_width + focus_pad); -#endif } static void @@ -338,20 +323,6 @@ gimp_color_wheel_get_preferred_height (GtkWidget *widget, gint *minimum_height, gint *natural_height) { -// TODO: Sync this fix with the upstream GIMP code when available -#if GTK_CHECK_VERSION(3,14,0) - gint outline_width; - gint padding; - gint outline_offset; - - gtk_widget_style_get (widget, - "outline-width", &outline_width, - "padding", &padding, - "outline-offset", &outline_offset, - NULL); - - *minimum_height = *natural_height = DEFAULT_SIZE + 2 * (outline_width + padding + outline_offset); -#else gint focus_width; gint focus_pad; @@ -361,7 +332,6 @@ gimp_color_wheel_get_preferred_height (GtkWidget *widget, NULL); *minimum_height = *natural_height = DEFAULT_SIZE + 2 * (focus_width + focus_pad); -#endif } static void |