[gtk/wip/baedert/for-master: 5/12] shortcutlabel: Inherit from GtkWidget

From: Timm Bäder <baedert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/wip/baedert/for-master: 5/12] shortcutlabel: Inherit from GtkWidget
Date: Sat, 19 Oct 2019 07:33:55 +0000 (UTC)
commit dbe2c4820ae153a1a0265ec9ee57e049fcc1a476
Author: Timm Bäder <mail baedert org>
Date:   Fri Oct 18 06:20:35 2019 +0200

    shortcutlabel: Inherit from GtkWidget

 gtk/gtkshortcutlabel.c                   | 50 +++++++++++++++++++++++---------
 gtk/gtkshortcutlabel.h                   |  2 +-
 gtk/gtkshortcutsshortcut.c               |  1 +
 gtk/theme/Adwaita/_common.scss           |  6 +++-
 gtk/theme/Adwaita/gtk-contained-dark.css | 50 ++++++++++++++++----------------
 gtk/theme/Adwaita/gtk-contained.css      | 50 ++++++++++++++++----------------
 6 files changed, 93 insertions(+), 66 deletions(-)
---
diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c
index 6f0b2e39e8..4afa3f901f 100644
--- a/gtk/gtkshortcutlabel.c
+++ b/gtk/gtkshortcutlabel.c
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include "gtkshortcutlabel.h"
+#include "gtkboxlayout.h"
 #include "gtklabel.h"
 #include "gtkframe.h"
 #include "gtkstylecontext.h"
@@ -37,17 +38,17 @@
 
 struct _GtkShortcutLabel
 {
-  GtkBox  parent_instance;
+  GtkWidget parent_instance;
   gchar  *accelerator;
   gchar  *disabled_text;
 };
 
 struct _GtkShortcutLabelClass
 {
-  GtkBoxClass parent_class;
+  GtkWidgetClass parent_class;
 };
 
-G_DEFINE_TYPE (GtkShortcutLabel, gtk_shortcut_label, GTK_TYPE_BOX)
+G_DEFINE_TYPE (GtkShortcutLabel, gtk_shortcut_label, GTK_TYPE_WIDGET)
 
 enum {
   PROP_0,
@@ -263,7 +264,7 @@ dim_label (const gchar *text)
 }
 
 static void
-display_shortcut (GtkContainer    *self,
+display_shortcut (GtkWidget       *self,
                   guint            key,
                   GdkModifierType  modifier)
 {
@@ -277,7 +278,7 @@ display_shortcut (GtkContainer    *self,
       GtkWidget *disp;
 
       if (i > 0)
-        gtk_container_add (self, dim_label ("+"));
+        gtk_widget_set_parent (dim_label ("+"), self);
 
       disp = gtk_label_new (keys[i]);
       if (i < n_mods)
@@ -286,7 +287,7 @@ display_shortcut (GtkContainer    *self,
       gtk_style_context_add_class (gtk_widget_get_style_context (disp), "keycap");
       gtk_label_set_use_markup (GTK_LABEL (disp), TRUE);
 
-      gtk_container_add (self, disp);
+      gtk_widget_set_parent (disp, self);
     }
   g_strfreev (keys);
 }
@@ -311,9 +312,9 @@ parse_combination (GtkShortcutLabel *self,
           break;
         }
       if (k > 0)
-        gtk_container_add (GTK_CONTAINER (self), dim_label ("+"));
+        gtk_widget_set_parent (dim_label ("+"), GTK_WIDGET (self));
 
-      display_shortcut (GTK_CONTAINER (self), key, modifier);
+      display_shortcut (GTK_WIDGET (self), key, modifier);
     }
   g_strfreev (accels);
 
@@ -357,7 +358,7 @@ parse_range (GtkShortcutLabel *self,
   if (!parse_sequence (self, str))
     return FALSE;
 
-  gtk_container_add (GTK_CONTAINER (self), dim_label ("⋯"));
+  gtk_widget_set_parent (dim_label ("⋯"), GTK_WIDGET (self));
 
   if (!parse_sequence (self, dots + 3))
     return FALSE;
@@ -365,13 +366,30 @@ parse_range (GtkShortcutLabel *self,
   return TRUE;
 }
 
+static void
+clear_children (GtkShortcutLabel *self)
+{
+  GtkWidget *child;
+
+  child = gtk_widget_get_first_child (GTK_WIDGET (self));
+
+  while (child)
+    {
+      GtkWidget *next = gtk_widget_get_next_sibling (child);
+
+      gtk_widget_unparent (child);
+
+      child = next;
+    }
+}
+
 static void
 gtk_shortcut_label_rebuild (GtkShortcutLabel *self)
 {
   gchar **accels;
   gint k;
 
-  gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback)gtk_widget_destroy, NULL);
+  clear_children (self);
 
   if (self->accelerator == NULL || self->accelerator[0] == '\0')
     {
@@ -379,7 +397,7 @@ gtk_shortcut_label_rebuild (GtkShortcutLabel *self)
 
       label = dim_label (self->disabled_text);
 
-      gtk_container_add (GTK_CONTAINER (self), label);
+      gtk_widget_set_parent (label, GTK_WIDGET (self));
       return;
     }
 
@@ -387,7 +405,7 @@ gtk_shortcut_label_rebuild (GtkShortcutLabel *self)
   for (k = 0; accels[k]; k++)
     {
       if (k > 0)
-        gtk_container_add (GTK_CONTAINER (self), dim_label ("/"));
+        gtk_widget_set_parent (dim_label ("/"), GTK_WIDGET (self));
 
       if (!parse_range (self, accels[k]))
         {
@@ -406,6 +424,8 @@ gtk_shortcut_label_finalize (GObject *object)
   g_free (self->accelerator);
   g_free (self->disabled_text);
 
+  clear_children (self);
+
   G_OBJECT_CLASS (gtk_shortcut_label_parent_class)->finalize (object);
 }
 
@@ -459,6 +479,7 @@ static void
 gtk_shortcut_label_class_init (GtkShortcutLabelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   object_class->finalize = gtk_shortcut_label_finalize;
   object_class->get_property = gtk_shortcut_label_get_property;
@@ -486,13 +507,14 @@ gtk_shortcut_label_class_init (GtkShortcutLabelClass *klass)
                          (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_properties (object_class, LAST_PROP, properties);
+
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
+  gtk_widget_class_set_css_name (widget_class, I_("shortcut"));
 }
 
 static void
 gtk_shortcut_label_init (GtkShortcutLabel *self)
 {
-  gtk_box_set_spacing (GTK_BOX (self), 6);
-
   /* Always use LTR so that modifiers are always left to the keyval */
   gtk_widget_set_direction (GTK_WIDGET (self), GTK_TEXT_DIR_LTR);
 }
diff --git a/gtk/gtkshortcutlabel.h b/gtk/gtkshortcutlabel.h
index b40178a5f3..a8842bcdd1 100644
--- a/gtk/gtkshortcutlabel.h
+++ b/gtk/gtkshortcutlabel.h
@@ -19,7 +19,7 @@
 #ifndef __GTK_SHORTCUT_LABEL_H__
 #define __GTK_SHORTCUT_LABEL_H__
 
-#include <gtk/gtkbox.h>
+#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c
index ca12da0d16..0aea8286d0 100644
--- a/gtk/gtkshortcutsshortcut.c
+++ b/gtk/gtkshortcutsshortcut.c
@@ -21,6 +21,7 @@
 #include "gtkshortcutsshortcutprivate.h"
 
 #include "gtkimage.h"
+#include "gtkbox.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkprivate.h"
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7305712e13..0c07a3ccf8 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4634,7 +4634,11 @@ shortcuts-section {
 }
 
 // shortcut window keys
-.keycap {
+shortcut {
+  border-spacing: 6px;
+}
+
+shortcut > .keycap {
   min-width: 20px;
   min-height: 25px;
   margin-top: 2px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 04a4c1303d..e3448253f0 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -82,9 +82,9 @@ assistant .sidebar label { padding: 6px 12px; }
 
 assistant .sidebar label.highlight { background-color: #5a5a59; }
 
-.csd popover.background > contents.touch-selection, .csd popover.background > contents.magnifier, 
popover.background > contents.touch-selection, popover.background > contents.magnifier, .csd 
popover.background > contents.osd, popover.background > contents.osd, .app-notification, 
.app-notification.frame, .osd .scale-popup, .osd { color: #eeeeec; border: none; background-color: rgba(37, 
37, 38, 0.7); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
+.osd popover.background > arrow, .osd popover.background > contents, popover.background.touch-selection > 
arrow, popover.background.touch-selection > contents, popover.background.magnifier > arrow, 
popover.background.magnifier > contents, .app-notification, .app-notification.frame, .osd .scale-popup, .osd 
{ color: #eeeeec; border: none; background-color: rgba(37, 37, 38, 0.7); background-clip: padding-box; 
text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
 
-.csd popover.background > contents.touch-selection:backdrop, .csd popover.background > 
contents.magnifier:backdrop, popover.background > contents.touch-selection:backdrop, popover.background > 
contents.magnifier:backdrop, .csd popover.background > contents.osd:backdrop, popover.background > 
contents.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { text-shadow: 
none; -gtk-icon-shadow: none; }
+.osd popover.background > arrow:backdrop, .osd popover.background > contents:backdrop, 
popover.background.touch-selection > arrow:backdrop, popover.background.touch-selection > contents:backdrop, 
popover.background.magnifier > arrow:backdrop, popover.background.magnifier > contents:backdrop, 
.app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { text-shadow: none; -gtk-icon-shadow: 
none; }
 
 /********************* Spinner Animation * */
 @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } }
@@ -281,25 +281,25 @@ button.osd:disabled:backdrop, button.osd:disabled { color: #8a8a89; border-color
 
 button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(37, 37, 38, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: 
none; -gtk-icon-shadow: none; border: none; }
 
-.csd popover.background > contents.touch-selection button, .csd popover.background > contents.magnifier 
button, popover.background > contents.touch-selection button, popover.background > contents.magnifier button, 
.app-notification button, .app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 
0, 0, 0.7); background-color: transparent; background-image: image(rgba(37, 37, 38, 0.7)); background-clip: 
padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; 
outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button, popover.background.magnifier button, .app-notification button, 
.app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(37, 37, 38, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button:hover, .csd popover.background > 
contents.magnifier button:hover, popover.background > contents.touch-selection button:hover, 
popover.background > contents.magnifier button:hover, .app-notification button:hover, .osd button:hover { 
color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: 
image(rgba(68, 68, 68, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); 
text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button:hover, popover.background.magnifier button:hover, 
.app-notification button:hover, .osd button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(68, 68, 68, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button:active:backdrop, .csd popover.background > 
contents.magnifier button:active:backdrop, popover.background > contents.touch-selection 
button:active:backdrop, popover.background > contents.magnifier button:active:backdrop, .app-notification 
button:active:backdrop, .csd popover.background > contents.touch-selection button:active, .csd 
popover.background > contents.magnifier button:active, popover.background > contents.touch-selection 
button:active, popover.background > contents.magnifier button:active, .app-notification button:active, .csd 
popover.background > contents.touch-selection button:checked:backdrop, .csd popover.background > 
contents.magnifier button:checked:backdrop, popover.background > contents.touch-selection 
button:checked:backdrop, popover.background > contents.magnifier button:checked:backdrop, .app-notification 
button:checked:backdrop, .csd popover.background > contents.touch-selection button:checked, .c
 sd popov
 er.background > contents.magnifier button:checked, popover.background > contents.touch-selection 
button:checked, popover.background > contents.magnifier button:checked, .app-notification button:checked, 
.osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { color: 
white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 
0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; 
outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button:active:backdrop, popover.background.magnifier 
button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection 
button:active, popover.background.magnifier button:active, .app-notification button:active, 
popover.background.touch-selection button:checked:backdrop, popover.background.magnifier 
button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection 
button:checked, popover.background.magnifier button:checked, .app-notification button:checked, .osd 
button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { color: white; 
border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); 
background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button:disabled:backdrop, .csd popover.background > 
contents.magnifier button:disabled:backdrop, popover.background > contents.touch-selection 
button:disabled:backdrop, popover.background > contents.magnifier button:disabled:backdrop, .app-notification 
button:disabled:backdrop, .csd popover.background > contents.touch-selection button:disabled, .csd 
popover.background > contents.magnifier button:disabled, popover.background > contents.touch-selection 
button:disabled, popover.background > contents.magnifier button:disabled, .app-notification button:disabled, 
.osd button:disabled:backdrop, .osd button:disabled { color: #8a8a89; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(58, 58, 57, 0.5)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }
+popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier 
button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection 
button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd 
button:disabled:backdrop, .osd button:disabled { color: #8a8a89; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(58, 58, 57, 0.5)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }
 
-.csd popover.background > contents.touch-selection button:backdrop, .csd popover.background > 
contents.magnifier button:backdrop, popover.background > contents.touch-selection button:backdrop, 
popover.background > contents.magnifier button:backdrop, .app-notification button:backdrop, .osd 
button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(37, 37, 38, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: 
none; -gtk-icon-shadow: none; }
+popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, 
.app-notification button:backdrop, .osd button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(37, 37, 38, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }
 
-.csd popover.background > contents.touch-selection button.flat, .csd popover.background > contents.magnifier 
button.flat, popover.background > contents.touch-selection button.flat, popover.background > 
contents.magnifier button.flat, .app-notification button.flat, .osd button.flat { border-color: transparent; 
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 
1px black; }
+popover.background.touch-selection button.flat, popover.background.magnifier button.flat, .app-notification 
button.flat, .osd button.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; box-shadow: 
none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
 
-.csd popover.background > contents.touch-selection button.flat:hover, .csd popover.background > 
contents.magnifier button.flat:hover, popover.background > contents.touch-selection button.flat:hover, 
popover.background > contents.magnifier button.flat:hover, .app-notification button.flat:hover, .osd 
button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(68, 68, 68, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); 
}
+popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, 
.app-notification button.flat:hover, .osd button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(68, 68, 68, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button.flat:disabled, .csd popover.background > 
contents.magnifier button.flat:disabled, popover.background > contents.touch-selection button.flat:disabled, 
popover.background > contents.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd 
button.flat:disabled { color: #8a8a89; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(58, 58, 57, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: 
none; -gtk-icon-shadow: none; background-image: none; border-color: transparent; box-shadow: none; }
+popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, 
.app-notification button.flat:disabled, .osd button.flat:disabled { color: #8a8a89; border-color: rgba(0, 0, 
0, 0.7); background-color: transparent; background-image: image(rgba(58, 58, 57, 0.5)); background-clip: 
padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-image: none; 
border-color: transparent; box-shadow: none; }
 
-.csd popover.background > contents.touch-selection button.flat:backdrop, .csd popover.background > 
contents.magnifier button.flat:backdrop, popover.background > contents.touch-selection button.flat:backdrop, 
popover.background > contents.magnifier button.flat:backdrop, .app-notification button.flat:backdrop, .osd 
button.flat:backdrop { border-color: transparent; background-color: transparent; background-image: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop, 
.app-notification button.flat:backdrop, .osd button.flat:backdrop { border-color: transparent; 
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); 
text-shadow: none; -gtk-icon-shadow: none; }
 
-.csd popover.background > contents.touch-selection button.flat:active, .csd popover.background > 
contents.magnifier button.flat:active, popover.background > contents.touch-selection button.flat:active, 
popover.background > contents.magnifier button.flat:active, .app-notification button.flat:active, .csd 
popover.background > contents.touch-selection button.flat:checked, .csd popover.background > 
contents.magnifier button.flat:checked, popover.background > contents.touch-selection button.flat:checked, 
popover.background > contents.magnifier button.flat:checked, .app-notification button.flat:checked, .osd 
button.flat:active, .osd button.flat:checked { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, 
.app-notification button.flat:active, popover.background.touch-selection button.flat:checked, 
popover.background.magnifier button.flat:checked, .app-notification button.flat:checked, .osd 
button.flat:active, .osd button.flat:checked { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
 
 button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #0f3b71; 
border-bottom-color: #092444; background-image: linear-gradient(to top, #155099 2px, #15539e); text-shadow: 0 
-1px rgba(0, 0, 0, 0.719216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.719216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
@@ -881,25 +881,23 @@ menuitem check:dir(ltr), menuitem radio:dir(ltr) { margin-right: 7px; }
 menuitem check:dir(rtl), menuitem radio:dir(rtl) { margin-left: 7px; }
 
 /*************** Popovers   * */
-popover.background { background-color: transparent; padding: 0px; }
+popover.background { background-color: transparent; font: initial; }
 
-popover.menu > arrow, popover > arrow { background-color: #353535; border: 1px solid #1b1b1b; }
+popover.background > arrow, popover.background > contents { background-color: #353535; border: 1px solid 
#1b1b1b; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
-popover > contents { padding: 8px; background-color: #353535; border: 1px solid #1b1b1b; margin: 0px; }
+popover.background > arrow:backdrop, popover.background > contents:backdrop { background-color: #353535; 
border-color: #202020; box-shadow: none; }
 
-popover.background > contents { background-color: #353535; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
-
-.csd popover.background > contents, popover.background > contents { border: 1px solid #1b1b1b; 
border-radius: 9px; }
-
-popover.background > contents:backdrop { background-color: #353535; box-shadow: none; }
+popover.background > contents { padding: 8px; border-radius: 9px; }
 
 popover.background > contents > list, popover.background > contents > .view, popover.background > contents > 
iconview, popover.background > contents > toolbar { border-style: none; background-color: transparent; }
 
-.csd popover.background > contents.touch-selection, .csd popover.background > contents.magnifier, 
popover.background > contents.touch-selection, popover.background > contents.magnifier { border: 1px solid 
rgba(255, 255, 255, 0.1); }
-
 popover.background > contents separator { margin: 3px; }
 
-popover.background > contents list separator { margin: 0px; }
+popover.background > contents list separator { margin: 0; }
+
+.osd popover.background, popover.background.touch-selection, popover.background.magnifier { 
background-color: transparent; }
+
+.osd popover.background > arrow, .osd popover.background > contents, popover.background.touch-selection > 
arrow, popover.background.touch-selection > contents, popover.background.magnifier > arrow, 
popover.background.magnifier > contents { border: 1px solid rgba(255, 255, 255, 0.1); box-shadow: none; }
 
 /************* Notebooks * */
 notebook > header { padding: 1px; border-color: #1b1b1b; border-width: 1px; background-color: #282828; }
@@ -2019,9 +2017,11 @@ shortcuts-section { margin: 20px; }
 
 .shortcuts-search-results { margin: 20px; border-spacing: 24px; }
 
-.keycap { min-width: 20px; min-height: 25px; margin-top: 2px; padding-bottom: 3px; padding-left: 6px; 
padding-right: 6px; color: #eeeeec; background-color: #2d2d2d; border: 1px solid; border-color: #1b1b1b; 
border-radius: 5px; box-shadow: inset 0 -3px #222222; font-size: smaller; }
+shortcut { border-spacing: 6px; }
+
+shortcut > .keycap { min-width: 20px; min-height: 25px; margin-top: 2px; padding-bottom: 3px; padding-left: 
6px; padding-right: 6px; color: #eeeeec; background-color: #2d2d2d; border: 1px solid; border-color: #1b1b1b; 
border-radius: 5px; box-shadow: inset 0 -3px #222222; font-size: smaller; }
 
-.keycap:backdrop { background-color: #303030; color: #919190; transition: 200ms ease-out; }
+shortcut > .keycap:backdrop { background-color: #303030; color: #919190; transition: 200ms ease-out; }
 
 :not(decoration):not(window):drop(active):focus, :not(decoration):not(window):drop(active) { border-color: 
#4e9a06; box-shadow: inset 0 0 0 1px #4e9a06; caret-color: #4e9a06; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1eb0a12099..374fb16356 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -82,9 +82,9 @@ assistant .sidebar label { padding: 6px 12px; }
 
 assistant .sidebar label.highlight { background-color: #cecece; }
 
-.csd popover.background > contents.touch-selection, .csd popover.background > contents.magnifier, 
popover.background > contents.touch-selection, popover.background > contents.magnifier, .csd 
popover.background > contents.osd, popover.background > contents.osd, .app-notification, 
.app-notification.frame, .osd .scale-popup, .osd { color: #eeeeec; border: none; background-color: rgba(53, 
53, 53, 0.7); background-clip: padding-box; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
+.osd popover.background > arrow, .osd popover.background > contents, popover.background.touch-selection > 
arrow, popover.background.touch-selection > contents, popover.background.magnifier > arrow, 
popover.background.magnifier > contents, .app-notification, .app-notification.frame, .osd .scale-popup, .osd 
{ color: #eeeeec; border: none; background-color: rgba(53, 53, 53, 0.7); background-clip: padding-box; 
text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
 
-.csd popover.background > contents.touch-selection:backdrop, .csd popover.background > 
contents.magnifier:backdrop, popover.background > contents.touch-selection:backdrop, popover.background > 
contents.magnifier:backdrop, .csd popover.background > contents.osd:backdrop, popover.background > 
contents.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { text-shadow: 
none; -gtk-icon-shadow: none; }
+.osd popover.background > arrow:backdrop, .osd popover.background > contents:backdrop, 
popover.background.touch-selection > arrow:backdrop, popover.background.touch-selection > contents:backdrop, 
popover.background.magnifier > arrow:backdrop, popover.background.magnifier > contents:backdrop, 
.app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop { text-shadow: none; -gtk-icon-shadow: 
none; }
 
 /********************* Spinner Animation * */
 @keyframes spin { to { -gtk-icon-transform: rotate(1turn); } }
@@ -283,25 +283,25 @@ button.osd:disabled:backdrop, button.osd:disabled { color: #919190; border-color
 
 button.osd:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(53, 53, 53, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: 
none; -gtk-icon-shadow: none; border: none; }
 
-.csd popover.background > contents.touch-selection button, .csd popover.background > contents.magnifier 
button, popover.background > contents.touch-selection button, popover.background > contents.magnifier button, 
.app-notification button, .app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 
0, 0, 0.7); background-color: transparent; background-image: image(rgba(53, 53, 53, 0.7)); background-clip: 
padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; 
outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button, popover.background.magnifier button, .app-notification button, 
.app-notification.frame button, .osd button { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(53, 53, 53, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button:hover, .csd popover.background > 
contents.magnifier button:hover, popover.background > contents.touch-selection button:hover, 
popover.background > contents.magnifier button:hover, .app-notification button:hover, .osd button:hover { 
color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: 
image(rgba(83, 83, 83, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); 
text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button:hover, popover.background.magnifier button:hover, 
.app-notification button:hover, .osd button:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(83, 83, 83, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button:active:backdrop, .csd popover.background > 
contents.magnifier button:active:backdrop, popover.background > contents.touch-selection 
button:active:backdrop, popover.background > contents.magnifier button:active:backdrop, .app-notification 
button:active:backdrop, .csd popover.background > contents.touch-selection button:active, .csd 
popover.background > contents.magnifier button:active, popover.background > contents.touch-selection 
button:active, popover.background > contents.magnifier button:active, .app-notification button:active, .csd 
popover.background > contents.touch-selection button:checked:backdrop, .csd popover.background > 
contents.magnifier button:checked:backdrop, popover.background > contents.touch-selection 
button:checked:backdrop, popover.background > contents.magnifier button:checked:backdrop, .app-notification 
button:checked:backdrop, .csd popover.background > contents.touch-selection button:checked, .c
 sd popov
 er.background > contents.magnifier button:checked, popover.background > contents.touch-selection 
button:checked, popover.background > contents.magnifier button:checked, .app-notification button:checked, 
.osd button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { color: 
white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 
0.7)); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; 
outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button:active:backdrop, popover.background.magnifier 
button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection 
button:active, popover.background.magnifier button:active, .app-notification button:active, 
popover.background.touch-selection button:checked:backdrop, popover.background.magnifier 
button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection 
button:checked, popover.background.magnifier button:checked, .app-notification button:checked, .osd 
button:active:backdrop, .osd button:active, .osd button:checked:backdrop, .osd button:checked { color: white; 
border-color: rgba(0, 0, 0, 0.7); background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); 
background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button:disabled:backdrop, .csd popover.background > 
contents.magnifier button:disabled:backdrop, popover.background > contents.touch-selection 
button:disabled:backdrop, popover.background > contents.magnifier button:disabled:backdrop, .app-notification 
button:disabled:backdrop, .csd popover.background > contents.touch-selection button:disabled, .csd 
popover.background > contents.magnifier button:disabled, popover.background > contents.touch-selection 
button:disabled, popover.background > contents.magnifier button:disabled, .app-notification button:disabled, 
.osd button:disabled:backdrop, .osd button:disabled { color: #919190; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(71, 71, 71, 0.5)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }
+popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier 
button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection 
button:disabled, popover.background.magnifier button:disabled, .app-notification button:disabled, .osd 
button:disabled:backdrop, .osd button:disabled { color: #919190; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(71, 71, 71, 0.5)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }
 
-.csd popover.background > contents.touch-selection button:backdrop, .csd popover.background > 
contents.magnifier button:backdrop, popover.background > contents.touch-selection button:backdrop, 
popover.background > contents.magnifier button:backdrop, .app-notification button:backdrop, .osd 
button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(53, 53, 53, 0.7)); background-clip: padding-box; box-shadow: none; text-shadow: 
none; -gtk-icon-shadow: none; }
+popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, 
.app-notification button:backdrop, .osd button:backdrop { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(53, 53, 53, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }
 
-.csd popover.background > contents.touch-selection button.flat, .csd popover.background > contents.magnifier 
button.flat, popover.background > contents.touch-selection button.flat, popover.background > 
contents.magnifier button.flat, .app-notification button.flat, .osd button.flat { border-color: transparent; 
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); 
text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 
1px black; }
+popover.background.touch-selection button.flat, popover.background.magnifier button.flat, .app-notification 
button.flat, .osd button.flat { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; box-shadow: 
none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
 
-.csd popover.background > contents.touch-selection button.flat:hover, .csd popover.background > 
contents.magnifier button.flat:hover, popover.background > contents.touch-selection button.flat:hover, 
popover.background > contents.magnifier button.flat:hover, .app-notification button.flat:hover, .osd 
button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(83, 83, 83, 0.7)); background-clip: padding-box; box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); 
}
+popover.background.touch-selection button.flat:hover, popover.background.magnifier button.flat:hover, 
.app-notification button.flat:hover, .osd button.flat:hover { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(83, 83, 83, 0.7)); background-clip: padding-box; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; -gtk-icon-shadow: none; outline-color: 
rgba(238, 238, 236, 0.3); }
 
-.csd popover.background > contents.touch-selection button.flat:disabled, .csd popover.background > 
contents.magnifier button.flat:disabled, popover.background > contents.touch-selection button.flat:disabled, 
popover.background > contents.magnifier button.flat:disabled, .app-notification button.flat:disabled, .osd 
button.flat:disabled { color: #919190; border-color: rgba(0, 0, 0, 0.7); background-color: transparent; 
background-image: image(rgba(71, 71, 71, 0.5)); background-clip: padding-box; box-shadow: none; text-shadow: 
none; -gtk-icon-shadow: none; background-image: none; border-color: transparent; box-shadow: none; }
+popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, 
.app-notification button.flat:disabled, .osd button.flat:disabled { color: #919190; border-color: rgba(0, 0, 
0, 0.7); background-color: transparent; background-image: image(rgba(71, 71, 71, 0.5)); background-clip: 
padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; background-image: none; 
border-color: transparent; box-shadow: none; }
 
-.csd popover.background > contents.touch-selection button.flat:backdrop, .csd popover.background > 
contents.magnifier button.flat:backdrop, popover.background > contents.touch-selection button.flat:backdrop, 
popover.background > contents.magnifier button.flat:backdrop, .app-notification button.flat:backdrop, .osd 
button.flat:backdrop { border-color: transparent; background-color: transparent; background-image: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
+popover.background.touch-selection button.flat:backdrop, popover.background.magnifier button.flat:backdrop, 
.app-notification button.flat:backdrop, .osd button.flat:backdrop { border-color: transparent; 
background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); 
text-shadow: none; -gtk-icon-shadow: none; }
 
-.csd popover.background > contents.touch-selection button.flat:active, .csd popover.background > 
contents.magnifier button.flat:active, popover.background > contents.touch-selection button.flat:active, 
popover.background > contents.magnifier button.flat:active, .app-notification button.flat:active, .csd 
popover.background > contents.touch-selection button.flat:checked, .csd popover.background > 
contents.magnifier button.flat:checked, popover.background > contents.touch-selection button.flat:checked, 
popover.background > contents.magnifier button.flat:checked, .app-notification button.flat:checked, .osd 
button.flat:active, .osd button.flat:checked { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
+popover.background.touch-selection button.flat:active, popover.background.magnifier button.flat:active, 
.app-notification button.flat:active, popover.background.touch-selection button.flat:checked, 
popover.background.magnifier button.flat:checked, .app-notification button.flat:checked, .osd 
button.flat:active, .osd button.flat:checked { color: white; border-color: rgba(0, 0, 0, 0.7); 
background-color: transparent; background-image: image(rgba(0, 0, 0, 0.7)); background-clip: padding-box; 
box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); }
 
 button.suggested-action { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: #1b6acb; 
border-bottom-color: #15539e; background-image: linear-gradient(to top, #2379e2 2px, #3584e4); text-shadow: 0 
-1px rgba(0, 0, 0, 0.559216); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.559216); box-shadow: inset 0 1px 
rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07); }
 
@@ -889,25 +889,23 @@ menuitem check:dir(ltr), menuitem radio:dir(ltr) { margin-right: 7px; }
 menuitem check:dir(rtl), menuitem radio:dir(rtl) { margin-left: 7px; }
 
 /*************** Popovers   * */
-popover.background { background-color: transparent; padding: 0px; }
+popover.background { background-color: transparent; font: initial; }
 
-popover.menu > arrow, popover > arrow { background-color: #f6f5f4; border: 1px solid #cdc7c2; }
+popover.background > arrow, popover.background > contents { background-color: #f6f5f4; border: 1px solid 
#cdc7c2; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
-popover > contents { padding: 8px; background-color: #f6f5f4; border: 1px solid #cdc7c2; margin: 0px; }
+popover.background > arrow:backdrop, popover.background > contents:backdrop { background-color: #f6f5f4; 
border-color: #d5d0cc; box-shadow: none; }
 
-popover.background > contents { background-color: #f6f5f4; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
-
-.csd popover.background > contents, popover.background > contents { border: 1px solid #cdc7c2; 
border-radius: 9px; }
-
-popover.background > contents:backdrop { background-color: #f6f5f4; box-shadow: none; }
+popover.background > contents { padding: 8px; border-radius: 9px; }
 
 popover.background > contents > list, popover.background > contents > .view, popover.background > contents > 
iconview, popover.background > contents > toolbar { border-style: none; background-color: transparent; }
 
-.csd popover.background > contents.touch-selection, .csd popover.background > contents.magnifier, 
popover.background > contents.touch-selection, popover.background > contents.magnifier { border: 1px solid 
rgba(255, 255, 255, 0.1); }
-
 popover.background > contents separator { margin: 3px; }
 
-popover.background > contents list separator { margin: 0px; }
+popover.background > contents list separator { margin: 0; }
+
+.osd popover.background, popover.background.touch-selection, popover.background.magnifier { 
background-color: transparent; }
+
+.osd popover.background > arrow, .osd popover.background > contents, popover.background.touch-selection > 
arrow, popover.background.touch-selection > contents, popover.background.magnifier > arrow, 
popover.background.magnifier > contents { border: 1px solid rgba(255, 255, 255, 0.1); box-shadow: none; }
 
 /************* Notebooks * */
 notebook > header { padding: 1px; border-color: #cdc7c2; border-width: 1px; background-color: #e1dedb; }
@@ -2035,9 +2033,11 @@ shortcuts-section { margin: 20px; }
 
 .shortcuts-search-results { margin: 20px; border-spacing: 24px; }
 
-.keycap { min-width: 20px; min-height: 25px; margin-top: 2px; padding-bottom: 3px; padding-left: 6px; 
padding-right: 6px; color: #2e3436; background-color: #ffffff; border: 1px solid; border-color: #e1dedb; 
border-radius: 5px; box-shadow: inset 0 -3px #f8f7f6; font-size: smaller; }
+shortcut { border-spacing: 6px; }
+
+shortcut > .keycap { min-width: 20px; min-height: 25px; margin-top: 2px; padding-bottom: 3px; padding-left: 
6px; padding-right: 6px; color: #2e3436; background-color: #ffffff; border: 1px solid; border-color: #e1dedb; 
border-radius: 5px; box-shadow: inset 0 -3px #f8f7f6; font-size: smaller; }
 
-.keycap:backdrop { background-color: #fcfcfc; color: #929595; transition: 200ms ease-out; }
+shortcut > .keycap:backdrop { background-color: #fcfcfc; color: #929595; transition: 200ms ease-out; }
 
 :not(decoration):not(window):drop(active):focus, :not(decoration):not(window):drop(active) { border-color: 
#4e9a06; box-shadow: inset 0 0 0 1px #4e9a06; caret-color: #4e9a06; }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]