[gtk+/wip/cosimoc/range-gadget] colorscale: don't use style properties to determine slider size
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cosimoc/range-gadget] colorscale: don't use style properties to determine slider size
- Date: Tue, 23 Feb 2016 03:10:38 +0000 (UTC)
commit 88b8796dcdd5ecf4c46d963aa2716e131b3c5e04
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Feb 22 19:08:09 2016 -0800
colorscale: don't use style properties to determine slider size
gtk/gtkcolorscale.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c
index 5509c9c..fd03029 100644
--- a/gtk/gtkcolorscale.c
+++ b/gtk/gtkcolorscale.c
@@ -23,6 +23,7 @@
#include "gtkgesturelongpress.h"
#include "gtkcolorutils.h"
#include "gtkorientable.h"
+#include "gtkrangeprivate.h"
#include "gtkstylecontext.h"
#include "gtkaccessible.h"
#include "gtkprivate.h"
@@ -62,14 +63,20 @@ gtk_color_scale_get_trough_size (GtkColorScale *scale,
gint *height_out)
{
GtkWidget *widget = GTK_WIDGET (scale);
+ GtkCssGadget *slider_gadget;
gint width, height;
gint x_offset, y_offset;
gint slider_width, slider_height;
- gtk_widget_style_get (widget,
- "slider-width", &slider_width,
- "slider-length", &slider_height,
- NULL);
+ slider_gadget = gtk_range_get_slider_gadget (GTK_RANGE (scale));
+ gtk_css_gadget_get_preferred_size (slider_gadget,
+ GTK_ORIENTATION_HORIZONTAL, -1,
+ &slider_width, NULL,
+ NULL, NULL);
+ gtk_css_gadget_get_preferred_size (slider_gadget,
+ GTK_ORIENTATION_VERTICAL, -1,
+ &slider_height, NULL,
+ NULL, NULL);
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]