[libpanel/wip/chergert/fix-14: 2/2] dock: rename PanelDockSwitcher to PanelToggleButton




commit 724dd7332da3f8745ff43136b7d85c81a54bc603
Author: Christian Hergert <chergert redhat com>
Date:   Sat Sep 10 15:31:33 2022 -0700

    dock: rename PanelDockSwitcher to PanelToggleButton
    
    A bit more clear about what it does, even if we're using the Panel prefix
    a bit doubly here.
    
    Related #14

 example/example-window.ui                          |  6 +-
 src/libpanel.gresource.xml                         |  2 +-
 src/libpanel.h                                     |  2 +-
 src/meson.build                                    |  4 +-
 src/panel-init.c                                   |  4 +-
 ...panel-dock-switcher.c => panel-toggle-button.c} | 93 +++++++++++-----------
 ...panel-dock-switcher.h => panel-toggle-button.h} |  6 +-
 ...nel-dock-switcher.ui => panel-toggle-button.ui} |  2 +-
 src/stylesheet.css                                 | 26 +++---
 testsuite/test-dock.ui                             |  2 +-
 10 files changed, 73 insertions(+), 74 deletions(-)
---
diff --git a/example/example-window.ui b/example/example-window.ui
index a8d7cb6..6291b6f 100644
--- a/example/example-window.ui
+++ b/example/example-window.ui
@@ -24,7 +24,7 @@
               </object>
             </child>
             <child type="start">
-              <object class="PanelDockSwitcher">
+              <object class="PanelToggleButton">
                 <property name="dock">dock</property>
                 <property name="area">start</property>
               </object>
@@ -345,7 +345,7 @@
               </object>
             </child>
             <child type="end">
-              <object class="PanelDockSwitcher">
+              <object class="PanelToggleButton">
                 <property name="dock">dock</property>
                 <property name="area">end</property>
               </object>
@@ -788,7 +788,7 @@
               </object>
             </child>
             <child type="suffix">
-              <object class="PanelDockSwitcher">
+              <object class="PanelToggleButton">
                 <property name="dock">dock</property>
                 <property name="area">bottom</property>
               </object>
diff --git a/src/libpanel.gresource.xml b/src/libpanel.gresource.xml
index 71f7241..80a6596 100644
--- a/src/libpanel.gresource.xml
+++ b/src/libpanel.gresource.xml
@@ -2,12 +2,12 @@
 <gresources>
   <gresource prefix="/org/gnome/libpanel">
     <file compressed="true">stylesheet.css</file>
-    <file compressed="true" preprocess="xml-stripblanks">panel-dock-switcher.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">panel-drop-controls.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">panel-frame-header-bar.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">panel-frame-header-bar-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">panel-frame.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">panel-save-dialog.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">panel-theme-selector.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">panel-toggle-button.ui</file>
   </gresource>
 </gresources>
diff --git a/src/libpanel.h b/src/libpanel.h
index 9285f00..1948406 100644
--- a/src/libpanel.h
+++ b/src/libpanel.h
@@ -22,7 +22,6 @@
 
 #define LIBPANEL_INSIDE
 # include "panel-dock.h"
-# include "panel-dock-switcher.h"
 # include "panel-enums.h"
 # include "panel-frame.h"
 # include "panel-frame-header.h"
@@ -37,5 +36,6 @@
 # include "panel-save-delegate.h"
 # include "panel-statusbar.h"
 # include "panel-theme-selector.h"
+# include "panel-toggle-button.h"
 # include "panel-widget.h"
 #undef LIBPANEL_INSIDE
diff --git a/src/meson.build b/src/meson.build
index 10f0524..619ada9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -32,7 +32,6 @@ libpanel_private_sources = [
 
 libpanel_sources = [
   'panel-dock.c',
-  'panel-dock-switcher.c',
   'panel-frame.c',
   'panel-frame-header.c',
   'panel-frame-header-bar.c',
@@ -47,12 +46,12 @@ libpanel_sources = [
   'panel-save-delegate.c',
   'panel-statusbar.c',
   'panel-theme-selector.c',
+  'panel-toggle-button.c',
   'panel-widget.c',
 ]
 
 libpanel_headers = [
   'libpanel.h',
-  'panel-dock-switcher.h',
   'panel-dock.h',
   'panel-frame.h',
   'panel-frame-header-bar.h',
@@ -67,6 +66,7 @@ libpanel_headers = [
   'panel-save-delegate.h',
   'panel-statusbar.h',
   'panel-theme-selector.h',
+  'panel-toggle-button.h',
   'panel-version-macros.h',
   'panel-widget.h',
 ]
diff --git a/src/panel-init.c b/src/panel-init.c
index 723d48f..e7fd0a4 100644
--- a/src/panel-init.c
+++ b/src/panel-init.c
@@ -24,7 +24,6 @@
 
 #include "panel-dock.h"
 #include "panel-dock-child-private.h"
-#include "panel-dock-switcher.h"
 #include "panel-enums.h"
 #include "panel-frame.h"
 #include "panel-frame-header.h"
@@ -37,6 +36,7 @@
 #include "panel-resources.h"
 #include "panel-statusbar.h"
 #include "panel-theme-selector.h"
+#include "panel-toggle-button.h"
 #include "panel-widget.h"
 
 static GtkCssProvider *css_provider;
@@ -54,7 +54,6 @@ panel_init (void)
   g_type_ensure (PANEL_TYPE_AREA);
   g_type_ensure (PANEL_TYPE_DOCK);
   g_type_ensure (PANEL_TYPE_DOCK_CHILD);
-  g_type_ensure (PANEL_TYPE_DOCK_SWITCHER);
   g_type_ensure (PANEL_TYPE_FRAME);
   g_type_ensure (PANEL_TYPE_FRAME_HEADER);
   g_type_ensure (PANEL_TYPE_FRAME_SWITCHER);
@@ -64,6 +63,7 @@ panel_init (void)
   g_type_ensure (PANEL_TYPE_PANED);
   g_type_ensure (PANEL_TYPE_STATUSBAR);
   g_type_ensure (PANEL_TYPE_THEME_SELECTOR);
+  g_type_ensure (PANEL_TYPE_TOGGLE_BUTTON);
   g_type_ensure (PANEL_TYPE_WIDGET);
 
   css_provider = gtk_css_provider_new ();
diff --git a/src/panel-dock-switcher.c b/src/panel-toggle-button.c
similarity index 77%
rename from src/panel-dock-switcher.c
rename to src/panel-toggle-button.c
index 0b6dddc..fa755eb 100644
--- a/src/panel-dock-switcher.c
+++ b/src/panel-toggle-button.c
@@ -22,13 +22,12 @@
 
 #include "panel-dock-private.h"
 #include "panel-dock-child-private.h"
-#include "panel-dock-switcher.h"
+#include "panel-toggle-button.h"
 #include "panel-enums.h"
 
 #define TIMEOUT_EXPAND 500
-#define EMPTY_DRAG_SIZE 100
 
-struct _PanelDockSwitcher
+struct _PanelToggleButton
 {
   GtkWidget        parent_instance;
 
@@ -41,7 +40,7 @@ struct _PanelDockSwitcher
   GBinding        *binding;
 };
 
-G_DEFINE_TYPE (PanelDockSwitcher, panel_dock_switcher, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE (PanelToggleButton, panel_toggle_button, GTK_TYPE_WIDGET)
 
 enum {
   PROP_0,
@@ -53,7 +52,7 @@ enum {
 static GParamSpec *properties [N_PROPS];
 
 GtkWidget *
-panel_dock_switcher_new (PanelDock *dock,
+panel_toggle_button_new (PanelDock *dock,
                          PanelArea  area)
 {
   g_return_val_if_fail (PANEL_IS_DOCK (dock), NULL);
@@ -63,20 +62,20 @@ panel_dock_switcher_new (PanelDock *dock,
                         area == PANEL_AREA_BOTTOM,
                         NULL);
 
-  return g_object_new (PANEL_TYPE_DOCK_SWITCHER,
+  return g_object_new (PANEL_TYPE_TOGGLE_BUTTON,
                        "dock", dock,
                        "area", area,
                        NULL);
 }
 
 static gboolean
-panel_dock_switcher_switch_timeout (gpointer data)
+panel_toggle_button_switch_timeout (gpointer data)
 {
   GtkToggleButton *button = data;
 
   g_assert (GTK_IS_TOGGLE_BUTTON (button));
 
-  g_object_steal_data (G_OBJECT (button), "-panel-switch-timer");
+  g_object_steal_data (G_OBJECT (button), "-panel-toggle-timer");
   gtk_toggle_button_set_active (button, TRUE);
 
   return G_SOURCE_REMOVE;
@@ -98,11 +97,11 @@ drag_enter_cb (GtkDropControllerMotion *motion,
     {
       guint switch_timer = g_timeout_add_full (G_PRIORITY_DEFAULT,
                                                TIMEOUT_EXPAND,
-                                               panel_dock_switcher_switch_timeout,
+                                               panel_toggle_button_switch_timeout,
                                                g_object_ref (button),
                                                g_object_unref);
-      g_source_set_name_by_id (switch_timer, "[panel] panel_dock_switcher_switch_timeout");
-      g_object_set_data (G_OBJECT (button), "-panel-switch-timer", GUINT_TO_POINTER (switch_timer));
+      g_source_set_name_by_id (switch_timer, "[panel] panel_toggle_button_switch_timeout");
+      g_object_set_data (G_OBJECT (button), "-panel-toggle-timer", GUINT_TO_POINTER (switch_timer));
     }
 }
 
@@ -116,7 +115,7 @@ drag_leave_cb (GtkDropControllerMotion *motion,
   g_assert (GTK_IS_DROP_CONTROLLER_MOTION (motion));
 
   button = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (motion));
-  switch_timer = GPOINTER_TO_UINT (g_object_steal_data (G_OBJECT (button), "-panel-switch-timer"));
+  switch_timer = GPOINTER_TO_UINT (g_object_steal_data (G_OBJECT (button), "-panel-toggle-timer"));
   if (switch_timer)
     g_source_remove (switch_timer);
 }
@@ -133,11 +132,11 @@ notify_child_revealed_cb (GtkRevealer            *revealer,
 }
 
 static void
-panel_dock_switcher_panel_drag_begin_cb (PanelDockSwitcher *self,
+panel_toggle_button_panel_drag_begin_cb (PanelToggleButton *self,
                                          PanelWidget       *widget,
                                          PanelDock         *dock)
 {
-  g_assert (PANEL_IS_DOCK_SWITCHER (self));
+  g_assert (PANEL_IS_TOGGLE_BUTTON (self));
   g_assert (PANEL_IS_WIDGET (widget));
   g_assert (PANEL_IS_DOCK (dock));
 
@@ -152,11 +151,11 @@ panel_dock_switcher_panel_drag_begin_cb (PanelDockSwitcher *self,
 }
 
 static void
-panel_dock_switcher_panel_drag_end_cb (PanelDockSwitcher *self,
+panel_toggle_button_panel_drag_end_cb (PanelToggleButton *self,
                                        PanelWidget       *widget,
                                        PanelDock         *dock)
 {
-  g_assert (PANEL_IS_DOCK_SWITCHER (self));
+  g_assert (PANEL_IS_TOGGLE_BUTTON (self));
   g_assert (PANEL_IS_WIDGET (widget));
   g_assert (PANEL_IS_DOCK (dock));
 
@@ -170,7 +169,7 @@ panel_dock_switcher_panel_drag_end_cb (PanelDockSwitcher *self,
 }
 
 static void
-panel_dock_switcher_notify_can_reveal_cb (PanelDock   *dock,
+panel_toggle_button_notify_can_reveal_cb (PanelDock   *dock,
                                           GParamSpec  *pspec,
                                           GtkRevealer *revealer)
 {
@@ -197,10 +196,10 @@ panel_dock_switcher_notify_can_reveal_cb (PanelDock   *dock,
 }
 
 static void
-panel_dock_switcher_set_dock (PanelDockSwitcher *self,
+panel_toggle_button_set_dock (PanelToggleButton *self,
                               PanelDock         *dock)
 {
-  g_return_if_fail (PANEL_IS_DOCK_SWITCHER (self));
+  g_return_if_fail (PANEL_IS_TOGGLE_BUTTON (self));
   g_return_if_fail (!dock || PANEL_IS_DOCK (dock));
 
   if (dock == self->dock)
@@ -210,13 +209,13 @@ panel_dock_switcher_set_dock (PanelDockSwitcher *self,
     {
       g_clear_pointer (&self->binding, g_binding_unbind);
       g_signal_handlers_disconnect_by_func (self->dock,
-                                            G_CALLBACK (panel_dock_switcher_notify_can_reveal_cb),
+                                            G_CALLBACK (panel_toggle_button_notify_can_reveal_cb),
                                             self->revealer);
       g_signal_handlers_disconnect_by_func (self->dock,
-                                            G_CALLBACK (panel_dock_switcher_panel_drag_begin_cb),
+                                            G_CALLBACK (panel_toggle_button_panel_drag_begin_cb),
                                             self);
       g_signal_handlers_disconnect_by_func (self->dock,
-                                            G_CALLBACK (panel_dock_switcher_panel_drag_end_cb),
+                                            G_CALLBACK (panel_toggle_button_panel_drag_end_cb),
                                             self);
     }
 
@@ -250,17 +249,17 @@ panel_dock_switcher_set_dock (PanelDockSwitcher *self,
                                               G_BINDING_BIDIRECTIONAL);
       g_signal_connect_object (self->dock,
                                "panel-drag-begin",
-                               G_CALLBACK (panel_dock_switcher_panel_drag_begin_cb),
+                               G_CALLBACK (panel_toggle_button_panel_drag_begin_cb),
                                self,
                                G_CONNECT_SWAPPED);
       g_signal_connect_object (self->dock,
                                "panel-drag-end",
-                               G_CALLBACK (panel_dock_switcher_panel_drag_end_cb),
+                               G_CALLBACK (panel_toggle_button_panel_drag_end_cb),
                                self,
                                G_CONNECT_SWAPPED);
       g_signal_connect_object (self->dock,
                                notify,
-                               G_CALLBACK (panel_dock_switcher_notify_can_reveal_cb),
+                               G_CALLBACK (panel_toggle_button_notify_can_reveal_cb),
                                self->revealer,
                                0);
 
@@ -269,13 +268,13 @@ panel_dock_switcher_set_dock (PanelDockSwitcher *self,
 }
 
 static void
-panel_dock_switcher_constructed (GObject *object)
+panel_toggle_button_constructed (GObject *object)
 {
-  PanelDockSwitcher *self = (PanelDockSwitcher *)object;
+  PanelToggleButton *self = (PanelToggleButton *)object;
 
-  g_assert (PANEL_IS_DOCK_SWITCHER (self));
+  g_assert (PANEL_IS_TOGGLE_BUTTON (self));
 
-  G_OBJECT_CLASS (panel_dock_switcher_parent_class)->constructed (object);
+  G_OBJECT_CLASS (panel_toggle_button_parent_class)->constructed (object);
 
   switch (self->area)
     {
@@ -302,23 +301,23 @@ panel_dock_switcher_constructed (GObject *object)
 }
 
 static void
-panel_dock_switcher_dispose (GObject *object)
+panel_toggle_button_dispose (GObject *object)
 {
-  PanelDockSwitcher *self = (PanelDockSwitcher *)object;
+  PanelToggleButton *self = (PanelToggleButton *)object;
 
   g_clear_object (&self->dock);
   g_clear_pointer ((GtkWidget **)&self->revealer, gtk_widget_unparent);
 
-  G_OBJECT_CLASS (panel_dock_switcher_parent_class)->dispose (object);
+  G_OBJECT_CLASS (panel_toggle_button_parent_class)->dispose (object);
 }
 
 static void
-panel_dock_switcher_get_property (GObject    *object,
+panel_toggle_button_get_property (GObject    *object,
                                   guint       prop_id,
                                   GValue     *value,
                                   GParamSpec *pspec)
 {
-  PanelDockSwitcher *self = PANEL_DOCK_SWITCHER (object);
+  PanelToggleButton *self = PANEL_TOGGLE_BUTTON (object);
 
   switch (prop_id)
     {
@@ -336,17 +335,17 @@ panel_dock_switcher_get_property (GObject    *object,
 }
 
 static void
-panel_dock_switcher_set_property (GObject      *object,
+panel_toggle_button_set_property (GObject      *object,
                                   guint         prop_id,
                                   const GValue *value,
                                   GParamSpec   *pspec)
 {
-  PanelDockSwitcher *self = PANEL_DOCK_SWITCHER (object);
+  PanelToggleButton *self = PANEL_TOGGLE_BUTTON (object);
 
   switch (prop_id)
     {
     case PROP_DOCK:
-      panel_dock_switcher_set_dock (self, g_value_get_object (value));
+      panel_toggle_button_set_dock (self, g_value_get_object (value));
       break;
 
     case PROP_AREA:
@@ -359,15 +358,15 @@ panel_dock_switcher_set_property (GObject      *object,
 }
 
 static void
-panel_dock_switcher_class_init (PanelDockSwitcherClass *klass)
+panel_toggle_button_class_init (PanelToggleButtonClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->constructed = panel_dock_switcher_constructed;
-  object_class->dispose = panel_dock_switcher_dispose;
-  object_class->get_property = panel_dock_switcher_get_property;
-  object_class->set_property = panel_dock_switcher_set_property;
+  object_class->constructed = panel_toggle_button_constructed;
+  object_class->dispose = panel_toggle_button_dispose;
+  object_class->get_property = panel_toggle_button_get_property;
+  object_class->set_property = panel_toggle_button_set_property;
 
   properties [PROP_DOCK] =
     g_param_spec_object ("dock", NULL, NULL,
@@ -383,17 +382,17 @@ panel_dock_switcher_class_init (PanelDockSwitcherClass *klass)
   g_object_class_install_properties (object_class, N_PROPS, properties);
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/libpanel/panel-dock-switcher.ui");
-  gtk_widget_class_set_css_name (widget_class, "paneldockswitcher");
-  gtk_widget_class_bind_template_child (widget_class, PanelDockSwitcher, button);
-  gtk_widget_class_bind_template_child (widget_class, PanelDockSwitcher, revealer);
+  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/libpanel/panel-toggle-button.ui");
+  gtk_widget_class_set_css_name (widget_class, "paneltogglebutton");
+  gtk_widget_class_bind_template_child (widget_class, PanelToggleButton, button);
+  gtk_widget_class_bind_template_child (widget_class, PanelToggleButton, revealer);
   gtk_widget_class_bind_template_callback (widget_class, drag_enter_cb);
   gtk_widget_class_bind_template_callback (widget_class, drag_leave_cb);
   gtk_widget_class_bind_template_callback (widget_class, notify_child_revealed_cb);
 }
 
 static void
-panel_dock_switcher_init (PanelDockSwitcher *self)
+panel_toggle_button_init (PanelToggleButton *self)
 {
   self->area = PANEL_AREA_START;
 
diff --git a/src/panel-dock-switcher.h b/src/panel-toggle-button.h
similarity index 82%
rename from src/panel-dock-switcher.h
rename to src/panel-toggle-button.h
index 9a1109e..f8a8ac9 100644
--- a/src/panel-dock-switcher.h
+++ b/src/panel-toggle-button.h
@@ -27,13 +27,13 @@
 
 G_BEGIN_DECLS
 
-#define PANEL_TYPE_DOCK_SWITCHER (panel_dock_switcher_get_type())
+#define PANEL_TYPE_TOGGLE_BUTTON (panel_toggle_button_get_type())
 
 PANEL_AVAILABLE_IN_ALL
-G_DECLARE_FINAL_TYPE (PanelDockSwitcher, panel_dock_switcher, PANEL, DOCK_SWITCHER, GtkWidget)
+G_DECLARE_FINAL_TYPE (PanelToggleButton, panel_toggle_button, PANEL, TOGGLE_BUTTON, GtkWidget)
 
 PANEL_AVAILABLE_IN_ALL
-GtkWidget *panel_dock_switcher_new (PanelDock *dock,
+GtkWidget *panel_toggle_button_new (PanelDock *dock,
                                     PanelArea  area);
 
 G_END_DECLS
diff --git a/src/panel-dock-switcher.ui b/src/panel-toggle-button.ui
similarity index 94%
rename from src/panel-dock-switcher.ui
rename to src/panel-toggle-button.ui
index 81a1ffd..a0c7919 100644
--- a/src/panel-dock-switcher.ui
+++ b/src/panel-toggle-button.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="PanelDockSwitcher" parent="GtkWidget">
+  <template class="PanelToggleButton" parent="GtkWidget">
     <child>
       <object class="GtkRevealer" id="revealer">
         <property name="transition-type">slide-right</property>
diff --git a/src/stylesheet.css b/src/stylesheet.css
index 14434f8..09f92db 100644
--- a/src/stylesheet.css
+++ b/src/stylesheet.css
@@ -1,7 +1,7 @@
 @define-color panel_bg_color @window_bg_color;
 @define-color panel_fg_color @window_fg_color;
 
-paneldockswitcher.drag-active button:not(:checked) {
+paneltogglebutton.drag-active button:not(:checked) {
   background: alpha(@accent_bg_color, .25);
 }
 
@@ -160,12 +160,12 @@ panelstatusbar:backdrop > * {
 panelstatusbar > *:last-child {
   border-right: none;
 }
-panelstatusbar paneldockswitcher,
+panelstatusbar paneltogglebutton,
 panelstatusbar > menubutton,
 panelstatusbar > dropdown {
   padding: 0;
 }
-panelstatusbar paneldockswitcher button,
+panelstatusbar paneltogglebutton button,
 panelstatusbar > dropdown > button,
 panelstatusbar > menubutton > button,
 panelstatusbar > button {
@@ -176,30 +176,30 @@ panelstatusbar > button {
 panelstatusbar.rounded > button:first-child,
 panelstatusbar.rounded > dropdown:first-child > button,
 panelstatusbar.rounded > menubutton:first-child > button,
-panelstatusbar.rounded > paneldockswitcher:first-child button {
+panelstatusbar.rounded > paneltogglebutton:first-child button {
   border-bottom-left-radius: 12px;
 }
 
 panelstatusbar.rounded > button:last-child,
 panelstatusbar.rounded > dropdown:last-child > button,
 panelstatusbar.rounded > menubutton:last-child > button,
-panelstatusbar.rounded > paneldockswitcher:last-child button {
+panelstatusbar.rounded > paneltogglebutton:last-child button {
   border-bottom-right-radius: 12px;
 }
-panelstatusbar paneldockswitcher button,
+panelstatusbar paneltogglebutton button,
 panelstatusbar > dropdown > button,
 panelstatusbar > menubutton > button,
 panelstatusbar > button {
   background: transparent;
 }
-panelstatusbar paneldockswitcher button:hover,
+panelstatusbar paneltogglebutton button:hover,
 panelstatusbar > dropdown > button:hover,
 panelstatusbar > menubutton > button:hover,
 panelstatusbar > button:hover {
   background: alpha(currentColor, .07);
 }
-panelstatusbar paneldockswitcher button:active,
-panelstatusbar paneldockswitcher button.keyboard-activating,
+panelstatusbar paneltogglebutton button:active,
+panelstatusbar paneltogglebutton button.keyboard-activating,
 panelstatusbar > dropdown > button:hover,
 panelstatusbar > dropdown > button.keyboard-activating,
 panelstatusbar > menubutton > button:hover,
@@ -208,20 +208,20 @@ panelstatusbar > button:hover,
 panelstatusbar > button.keyboard-activating {
   background: alpha(currentColor, .16);
 }
-panelstatusbar paneldockswitcher button:checked,
+panelstatusbar paneltogglebutton button:checked,
 panelstatusbar > dropdown > button:checked,
 panelstatusbar > menubutton > button:checked,
 panelstatusbar > button:checked {
   background: alpha(currentColor, .1);
 }
-panelstatusbar paneldockswitcher button:checked:hover,
+panelstatusbar paneltogglebutton button:checked:hover,
 panelstatusbar > dropdown > button:checked:hover,
 panelstatusbar > menubutton > button:checked:hover,
 panelstatusbar > button:hover {
   background: alpha(currentColor, .13);
 }
-panelstatusbar paneldockswitcher button:checked:active,
-panelstatusbar paneldockswitcher button:checked.keyboard-activating,
+panelstatusbar paneltogglebutton button:checked:active,
+panelstatusbar paneltogglebutton button:checked.keyboard-activating,
 panelstatusbar > dropdown > button:checked:hover,
 panelstatusbar > dropdown > button:checked.keyboard-activating,
 panelstatusbar > menubutton > button:checked:hover,
diff --git a/testsuite/test-dock.ui b/testsuite/test-dock.ui
index a788a2e..ec46475 100644
--- a/testsuite/test-dock.ui
+++ b/testsuite/test-dock.ui
@@ -3,7 +3,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <child>
-          <object class="PanelDockSwitcher">
+          <object class="PanelToggleButton">
             <property name="dock">dock</property>
           </object>
         </child>


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