[gtk+] combobox: Add a special class for the button in the combobox

From: Benjamin Otte <otte src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] combobox: Add a special class for the button in the combobox
Date: Thu, 27 Aug 2015 18:21:03 +0000 (UTC)

commit 9ce91a12512e9306af4543e30921adaaa14fcdc5
Author: Benjamin Otte <otte redhat com>
Date:   Thu Aug 27 19:36:18 2015 +0200

    combobox: Add a special class for the button in the combobox
    
    That way, the GTK engine doesn't think that the general .button CSS
    might potentially apply to it.
    And because combobox button is overly complex and stupid, it cannot be
    cached.
    
    So buttons thought they cannot ever cache anything because they might
    suddenly end up inside a combobox without noticing and then they'd need
    to round their corners differently. Of course they're just regular
    "Remove" buttons like all the other 100s of "Remove" buttons in
    gnome-software. But hey, better not cache anything for them and
    recompute their CSS every time the :hover state changes on one of the
    rows.

 gtk/theme/Adwaita/_common.scss           |   42 +++++++++++++-------------
 gtk/theme/Adwaita/gtk-contained-dark.css |   41 +++++++++++++-------------
 gtk/theme/Adwaita/gtk-contained.css      |   46 +++++++++++++++--------------
 gtk/ui/gtkcombobox.ui                    |    3 ++
 4 files changed, 68 insertions(+), 64 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index e985189..74a8a7f 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -326,8 +326,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   // :not(:only-child) is a specificity bump hack.
   > .entry:focus:not(:only-child) + .entry,
   > .entry:focus:not(:only-child) + .button,
-  > .entry:focus:not(:only-child) + GtkComboBox > .button,
-  > .entry:focus:not(:only-child) + GtkComboBoxText > .button { border-top-color: entry_focus_border(); }
+  > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+  > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: 
entry_focus_border(); }
 }
 
 
@@ -969,9 +969,9 @@ GtkColorButton.button {
  * ComboBoxes *
  **************/
 GtkComboBox {
-  > .button { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos
-                                                       // are bigger then
-                                                       // buttons
+  > .the-button-in-the-combobox { padding-top: 3px; padding-bottom: 4px; } // Otherwise combos
+                                                                           // are bigger then
+                                                                           // buttons
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
 
@@ -1021,35 +1021,35 @@ GtkComboBox {
   }
 }
 
-.linked > GtkComboBox > .button,
-.linked > GtkComboBoxText > .button {
+.linked > GtkComboBox > .the-button-in-the-combobox,
+.linked > GtkComboBoxText > .the-button-in-the-combobox {
   // the combo is a composite widget so the way we do button linkind doesn't
   // work, special case needed. See
   // https://bugzilla.gnome.org/show_bug.cgi?id=733979
   &:dir(ltr),
   &:dir(rtl) { @extend %linked_middle; } // specificity bump
 }
-.linked > GtkComboBox:first-child > .button,
-.linked > GtkComboBoxText:first-child > .button {
+.linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   @extend %linked:first-child;
 }
-.linked > GtkComboBox:last-child > .button,
-.linked > GtkComboBoxText:last-child > .button {
+.linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   @extend %linked:last-child;
 }
-.linked > GtkComboBox:only-child > .button,
-.linked > GtkComboBoxText:only-child > .button {
+.linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   @extend %linked:only-child;
 }
 
-.linked.vertical > GtkComboBoxText > .button,
-.linked.vertical > GtkComboBox > .button { @extend %linked_vertical_middle; }
-.linked.vertical > GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button { @extend %linked_vertical:first-child; }
-.linked.vertical > GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button { @extend %linked_vertical:last-child; }
-.linked.vertical > GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button { @extend %linked_vertical:only-child; }
+.linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox > .the-button-in-the-combobox { @extend %linked_vertical_middle; }
+.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox { @extend 
%linked_vertical:first-child; }
+.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox { @extend 
%linked_vertical:last-child; }
+.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox { @extend 
%linked_vertical:only-child; }
 
 /************
  * Toolbars *
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 3723ba1..2b97646 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -300,8 +300,8 @@ GtkTextView {
   border-top-color: #0f2b48; }
 .linked.vertical > .entry:focus:not(:only-child) + .entry,
 .linked.vertical > .entry:focus:not(:only-child) + .button,
-.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .button,
-.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .button {
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
   border-top-color: #0f2b48; }
 
 /***********
@@ -1045,9 +1045,9 @@ GtkTextView {
 .titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > .entry, 
.osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd 
.button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, 
.osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, 
.osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd 
.button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd 
.button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd 
.button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, 
.osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd 
.button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd
  .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar 
.button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
 .inline-toolbar .titlebar .button.titlebutton,
 .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar .button:backdrop, .linked > .button, 
.header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > 
.button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .button:dir(ltr), .linked > GtkComboBox

.button:dir(rtl),

-.linked > GtkComboBoxText > .button:dir(ltr),
-.linked > GtkComboBoxText > .button:dir(rtl) {
+.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > 
.button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), 
.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
   border-right-style: none; }
 
@@ -1065,8 +1065,8 @@ GtkTextView {
 .inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > 
GtkComboBox:first-child > .button,
-.linked > GtkComboBoxText:first-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > 
GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > .entry:last-child, .osd .button:last-child:hover, .osd .button:last-child:active, 
.osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd 
.button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar 
.button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
.button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:last-child > .button.tit
 lebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
@@ -1083,8 +1083,8 @@ GtkTextView {
 .inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > 
GtkComboBox:last-child > .button,
-.linked > GtkComboBoxText:last-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > 
GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
@@ -1102,27 +1102,27 @@ GtkTextView {
 .inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > 
GtkComboBox:only-child > .button,
-.linked > GtkComboBoxText:only-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > 
GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > .entry, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .button,
-.linked.vertical > GtkComboBox > .button {
+.linked.vertical > .entry, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > 
GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button {
+.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > 
GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > 
GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button {
+.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > 
GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > 
GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button {
+.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > 
GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1442,8 +1442,7 @@ GtkComboBox {
   box-shadow: 0 1px rgba(238, 238, 236, 0.1);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
-  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
-  .titlebar GtkComboBox > .button.titlebutton {
+  GtkComboBox > .the-button-in-the-combobox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 8ac8a59..7d802ed 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -300,8 +300,8 @@ GtkTextView {
   border-top-color: #4a90d9; }
 .linked.vertical > .entry:focus:not(:only-child) + .entry,
 .linked.vertical > .entry:focus:not(:only-child) + .button,
-.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .button,
-.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .button {
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
   border-top-color: #4a90d9; }
 
 /***********
@@ -1045,9 +1045,9 @@ GtkTextView {
 .titlebar .inline-toolbar GtkToolButton:backdrop > .button.titlebutton, .linked:not(.vertical) > .entry, 
.osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:backdrop:active, .osd 
.button:backdrop:checked, .osd .button:insensitive, .osd .button:backdrop:insensitive, .osd .button:backdrop, 
.osd .button.suggested-action, .osd .button.suggested-action:hover, .osd .button.suggested-action:active, 
.osd .button.suggested-action:checked, .osd .button.suggested-action:backdrop:active, .osd 
.button.suggested-action:backdrop:checked, .osd .button.suggested-action:insensitive, .osd 
.button.suggested-action:backdrop:insensitive, .osd .button.suggested-action:backdrop, .osd 
.button.destructive-action, .osd .button.destructive-action:hover, .osd .button.destructive-action:active, 
.osd .button.destructive-action:checked, .osd .button.destructive-action:backdrop:active, .osd 
.button.destructive-action:backdrop:checked, .osd .button.destructive-action:insensitive, .osd
  .button.destructive-action:backdrop:insensitive, .osd .button.destructive-action:backdrop, .inline-toolbar 
.button, .inline-toolbar .header-bar .button.titlebutton, .header-bar .inline-toolbar .button.titlebutton,
 .inline-toolbar .titlebar .button.titlebutton,
 .titlebar .inline-toolbar .button.titlebutton, .inline-toolbar .button:backdrop, .linked > .button, 
.header-bar .linked > .button.titlebutton,
-.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > 
.button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .button:dir(ltr), .linked > GtkComboBox

.button:dir(rtl),

-.linked > GtkComboBoxText > .button:dir(ltr),
-.linked > GtkComboBoxText > .button:dir(rtl) {
+.titlebar .linked > .button.titlebutton, .linked > .button:hover, .linked > .button:active, .linked > 
.button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr), 
.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
   border-right-style: none; }
 
@@ -1065,8 +1065,8 @@ GtkTextView {
 .inline-toolbar .header-bar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:first-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > 
GtkComboBox:first-child > .button,
-.linked > GtkComboBoxText:first-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:first-child > .button.titlebutton, .linked > 
GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 .linked:not(.vertical) > .entry:last-child, .osd .button:last-child:hover, .osd .button:last-child:active, 
.osd .button:last-child:checked, .osd .button:last-child:insensitive, .osd .button:last-child:backdrop, .osd 
.button.suggested-action:last-child, .osd .button.destructive-action:last-child, .inline-toolbar 
.button:last-child, .linked > .button:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > 
.button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.search-bar 
GtkToolButton:last-child > .button.flat, .inline-toolbar.location-bar GtkToolButton:last-child > 
.button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar 
GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar.search-bar GtkToolButton:last-child > 
.sidebar-button.button, .inline-toolbar.location-bar GtkToolButton:last-child > .sidebar-button.button, 
.inline-toolbar .header-bar GtkToolButton:last-child > .button.tit
 lebutton, .header-bar .inline-toolbar GtkToolButton:last-child > .button.titlebutton,
@@ -1083,8 +1083,8 @@ GtkTextView {
 .inline-toolbar .header-bar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:last-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > 
GtkComboBox:last-child > .button,
-.linked > GtkComboBoxText:last-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:last-child > .button.titlebutton, .linked > 
GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
@@ -1102,27 +1102,27 @@ GtkTextView {
 .inline-toolbar .header-bar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .header-bar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton:backdrop:only-child > .button.titlebutton,
-.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > 
GtkComboBox:only-child > .button,
-.linked > GtkComboBoxText:only-child > .button {
+.titlebar .inline-toolbar GtkToolButton:backdrop:only-child > .button.titlebutton, .linked > 
GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > .entry, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .button,
-.linked.vertical > GtkComboBox > .button {
+.linked.vertical > .entry, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox > .the-button-in-the-combobox {
   border-style: solid solid none solid;
   border-radius: 0; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > 
GtkComboBoxText:first-child > .button,
-.linked.vertical > GtkComboBox:first-child > .button {
+.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > 
GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > 
GtkComboBoxText:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button {
+.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > 
GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > 
GtkComboBoxText:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button {
+.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > 
GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
 
@@ -1442,8 +1442,7 @@ GtkComboBox {
   box-shadow: 0 1px white;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
-  GtkComboBox > .button, .header-bar GtkComboBox > .button.titlebutton,
-  .titlebar GtkComboBox > .button.titlebutton {
+  GtkComboBox > .the-button-in-the-combobox {
     padding-top: 3px;
     padding-bottom: 4px; }
   GtkComboBox:insensitive {
@@ -3855,8 +3854,11 @@ GtkCalendar {
     GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
     .titlebar GtkCalendar.button.titlebutton:insensitive {
       color: rgba(141, 144, 145, 0.45); }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, 
GtkCalendar.highlight:backdrop {
+  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    color: #2e3436;
+    background: #a1a1a1; }
   GtkCalendar:backdrop {
     color: #323232;
     border-color: #a8a8a8; }
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index 64e5396..c16bbdf 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -7,6 +7,9 @@
         <property name="visible">True</property>
         <property name="focus-on-click">True</property>
         <signal name="toggled" handler="gtk_combo_box_button_toggled" swapped="no"/>
+        <style>
+          <class name="the-button-in-the-combobox"/>
+        </style>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>

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