[gtk+/wip/baedert/drawing: 229/306] scrollbar: Add new API to gtk4-sections.txt



commit 0be5646d6ef78ddd683dd9b1135ed5fa01edcbe5
Author: Timm Bäder <mail baedert org>
Date:   Thu May 25 17:34:23 2017 +0200

    scrollbar: Add new API to gtk4-sections.txt
    
    and update the css node docs

 docs/reference/gtk/gtk4-sections.txt |    2 ++
 gtk/gtkrange.c                       |    1 +
 gtk/gtkscrollbar.c                   |   16 +++++++---------
 gtk/gtkscrollbar.h                   |    2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index b99227b..2f99965 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -2524,6 +2524,8 @@ gtk_scrollable_get_type
 <TITLE>GtkScrollbar</TITLE>
 GtkScrollbar
 gtk_scrollbar_new
+gtk_scrollbar_get_adjustment
+gtk_scrollbar_set_adjustment
 <SUBSECTION Standard>
 GTK_SCROLLBAR
 GTK_IS_SCROLLBAR
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index f8afc2c..efb0e97 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -458,6 +458,7 @@ gtk_range_class_init (GtkRangeClass *class)
   g_object_class_install_properties (gobject_class, LAST_PROP, properties);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RANGE_ACCESSIBLE);
+  gtk_widget_class_set_css_name (widget_class, "range");
 }
 
 static void
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 13268f0..2f6b7c8 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include "gtkscrollbar.h"
-#include "gtkrangeprivate.h"
+#include "gtkrange.h"
 
 #include "gtkadjustment.h"
 #include "gtkintl.h"
@@ -59,17 +59,15 @@
  *
  * |[<!-- language="plain" -->
  * scrollbar[.fine-tune]
- * ╰── contents
- *     ├── [button.up]
- *     ├── [button.down]
- *     ├── trough
- *     │   ╰── slider
- *     ├── [button.up]
- *     ╰── [button.down]
+ * ╰── box
+ *     ╰── range
+ *         ╰── trough
+ *             ╰── slider
  * ]|
  *
  * GtkScrollbar has a main CSS node with name scrollbar and a subnode for its
- * contents, with subnodes named trough and slider.
+ * contents. Both the main node and the box subnode get the .horizontal or .vertical
+ * style classes applied, depending on the scrollbar's orientation.
  *
  * The main node gets the style class .fine-tune added when the scrollbar is
  * in 'fine-tuning' mode.
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 1844c53..0f35a93 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -30,7 +30,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkrange.h>
+#include <gtk/gtkwidget.h>
 
 
 G_BEGIN_DECLS


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]