From 19808d480363e757925e33b27cfa55272ce803e7 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Fri, 8 Mar 2013 00:42:05 +0530
Subject: [PATCH] Fixes to GtkComboBox
---
gtk-2.0/gtkrc | 10 ----------
gtk-3.0/gtk-widgets.css | 13 ++++++++-----
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 0591a60..b0e137b 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -670,16 +670,6 @@ style "murrine-nautilus-location" {
widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location"
-style "menuitem-text-is-fg-color-workaround" {
- text[NORMAL] = @text_color
- text[PRELIGHT] = @selected_fg_color
- text[SELECTED] = @selected_fg_color
- text[ACTIVE] = @fg_color
- text[INSENSITIVE] = mix (0.5, @bg_color, @fg_color)
-}
-
-widget "*.gtk-combobox-popup-menu.*" style "menuitem-text-is-fg-color-workaround"
-
style "text-is-fg-color-workaround" {
text[NORMAL] = @text_color
text[PRELIGHT] = @fg_color
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 2a53988..fc747dc 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -822,7 +822,6 @@ GtkComboBox .menu {
background-color: @menu_bg_color;
background-image: none;
}
-
/***********
* menubar *
***********/
@@ -936,7 +935,6 @@ GtkTreeMenu .menuitem * {
.menuitem .accelerator:insensitive {
color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6);
}
-
/************
* notebook *
************/
@@ -1340,6 +1338,11 @@ GtkScrolledWindow GtkViewport.frame {
-GtkMenuItem-horizontal-padding: 0;
-GtkWidget-separator-height: 1;
+ border-image: -gtk-gradient(linear,
+ left top, left bottom,
+ from (shade(@menu_bg_color, 0.9)),
+ to (shade(@menu_bg_color, 0.9))) 1;
+
border-color: shade(@menu_bg_color, 0.9);
color: shade(@menu_bg_color, 0.9);
}
@@ -1634,10 +1637,10 @@ GtkTextView {
}
.primary-toolbar GtkComboBox,
+.primary-toolbar GtkComboBox .cell
.primary-toolbar .button *,
.primary-toolbar .button,
-.toolbar GtkComboBox,
-.toolbar GtkComboBox * {
+.toolbar GtkComboBox .cell {
padding: 2px;
border-width: 1px;
border-color: transparent;
@@ -1658,7 +1661,7 @@ GtkTextView {
.primary-toolbar .button:hover,
.toolbar .button:hover,
-.toolbar GtkComboBox *:hover {
+.toolbar GtkComboBox .cell:hover {
border-color: shade(@toolbar_bg_color, 0.7);
background-color: shade(@toolbar_bg_color, 1.10);
background-image: none;