[gnome-builder] editortweak: use GtkToggleButton instead of GtkModelButton

[Christian Hergert <chergert src gnome org>]

commit 578efc092a4f2aac1bd5953e41ef2a3ab12d3e04
Author: Christian Hergert <chergert redhat com>
Date:   Thu Dec 10 02:14:23 2015 -0800

    editortweak: use GtkToggleButton instead of GtkModelButton
    
    In some cases, we can just use GtkToggleButton instead of GtkModelButton.
    The state application doesn't seem to match what was working for us up
    to 3.18.5, and is particulary difficult to track down why. Probably CSS
    node fallout, but patch inspection didn't show anything obvious.

 data/theme/shared.css                   |    8 +++++++
 data/ui/ide-editor-tweak-widget.ui      |   33 ++++++++++++++----------------
 libide/editor/ide-editor-tweak-widget.c |    1 +
 3 files changed, 24 insertions(+), 18 deletions(-)
---
diff --git a/data/theme/shared.css b/data/theme/shared.css
index 794134c..af84c94 100644
--- a/data/theme/shared.css
+++ b/data/theme/shared.css
@@ -172,3 +172,11 @@ layouttab box.navigation button:first-child {
 layouttab box.navigation button:last-child {
   padding-left: 6px;
 }
+
+
+editortweak box.indentation button {
+  padding: 0px;
+}
+editortweak box.indentation button label {
+  padding: 2px 12px 2px 12;
+}
diff --git a/data/ui/ide-editor-tweak-widget.ui b/data/ui/ide-editor-tweak-widget.ui
index dc75b5b..7ea8780 100644
--- a/data/ui/ide-editor-tweak-widget.ui
+++ b/data/ui/ide-editor-tweak-widget.ui
@@ -108,6 +108,9 @@
                 <property name="orientation">horizontal</property>
                 <property name="halign">center</property>
                 <property name="spacing">12</property>
+                <style>
+                  <class name="indentation"/>
+                </style>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">true</property>
@@ -117,25 +120,23 @@
                       <class name="linked"/>
                     </style>
                     <child>
-                      <object class="GtkModelButton">
+                      <object class="GtkToggleButton">
                         <property name="visible">true</property>
-                        <property name="text" translatable="yes">Spaces</property>
+                        <property name="label" translatable="yes">Spaces</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">view.use-spaces</property>
                         <property name="action-target">true</property>
-                        <property name="iconic">true</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkModelButton">
+                      <object class="GtkToggleButton" id="tabs_button">
                         <property name="visible">true</property>
-                        <property name="text" translatable="yes">Tabs</property>
+                        <property name="label" translatable="yes">Tabs</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">view.use-spaces</property>
                         <property name="action-target">false</property>
-                        <property name="iconic">true</property>
                       </object>
                     </child>
                   </object>
@@ -149,10 +150,9 @@
                       <class name="linked"/>
                     </style>
                     <child>
-                      <object class="GtkModelButton">
-                        <property name="iconic">True</property>
+                      <object class="GtkToggleButton">
                         <property name="visible">true</property>
-                        <property name="text" translatable="yes">2</property>
+                        <property name="label" translatable="yes">2</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">view.tab-width</property>
@@ -160,10 +160,9 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkModelButton">
-                        <property name="iconic">True</property>
+                      <object class="GtkToggleButton">
                         <property name="visible">true</property>
-                        <property name="text" translatable="yes">3</property>
+                        <property name="label" translatable="yes">3</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">view.tab-width</property>
@@ -171,10 +170,9 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkModelButton">
-                        <property name="iconic">True</property>
+                      <object class="GtkToggleButton">
                         <property name="visible">true</property>
-                        <property name="text" translatable="yes">4</property>
+                        <property name="label" translatable="yes">4</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">view.tab-width</property>
@@ -182,10 +180,9 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkModelButton">
-                        <property name="iconic">True</property>
+                      <object class="GtkToggleButton">
                         <property name="visible">true</property>
-                        <property name="text" translatable="yes">8</property>
+                        <property name="label" translatable="yes">8</property>
                         <property name="focus-on-click">false</property>
                         <property name="halign">fill</property>
                         <property name="action-name">view.tab-width</property>
diff --git a/libide/editor/ide-editor-tweak-widget.c b/libide/editor/ide-editor-tweak-widget.c
index 7304c5f..63ece92 100644
--- a/libide/editor/ide-editor-tweak-widget.c
+++ b/libide/editor/ide-editor-tweak-widget.c
@@ -170,6 +170,7 @@ ide_editor_tweak_widget_class_init (IdeEditorTweakWidgetClass *klass)
 
   object_class->constructed = ide_editor_tweak_widget_constructed;
 
+  gtk_widget_class_set_css_name (widget_class, "editortweak");
   gtk_widget_class_set_template_from_resource (widget_class, 
"/org/gnome/builder/ui/ide-editor-tweak-widget.ui");
   gtk_widget_class_bind_template_child (widget_class, IdeEditorTweakWidget, entry);
   gtk_widget_class_bind_template_child (widget_class, IdeEditorTweakWidget, list_box);