Make menubar like gtk3

https://bugzilla.gnome.org/show_bug.cgi?id=747679

3 files changed, 26 insertions, 6 deletions

diff --git a/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png b/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png
index 744847e8..52ab1ef2 100644
--- a/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png
+++ b/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar.png
diff --git a/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png b/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png
index 7bb832c8..f7af21e9 100644
--- a/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png
+++ b/themes/Adwaita/gtk-2.0/Menu-Menubar/menubar_button.png
diff --git a/themes/Adwaita/gtk-2.0/gtkrc b/themes/Adwaita/gtk-2.0/gtkrc
index 1ba20820..df9826c9 100755
--- a/themes/Adwaita/gtk-2.0/gtkrc
+++ b/themes/Adwaita/gtk-2.0/gtkrc
@@ -675,11 +675,23 @@ style "scrollbar"
 
 style "menubar"
 {
-	bg[PRELIGHT]	= "#FFF"
-	fg[SELECTED]	= @text_color
+	engine "pixmap"
+	{
+	  image
+          {
+	      function		= BOX
+	      state		= NORMAL
+	      file		= "Menu-Menubar/menubar.png"
+	      border		= { 0, 0, 0, 1 }
+	      stretch		= TRUE
+	  }
+	}
+}
 
-	xthickness	= 0
-	ythickness	= 0
+style "menubar_button"
+{
+	xthickness	= 3
+	ythickness	= 4
 
 	engine "pixmap"
 	{
@@ -689,13 +701,18 @@ style "menubar"
 	      recolorable	= TRUE
 	      state		= PRELIGHT
 	      file		= "Menu-Menubar/menubar_button.png"
-
 	      border		= { 4, 4, 4, 4 }
 	      stretch		= TRUE
 	  }
 	}
 }
 
+style "libreoffice_menubar_button"
+{
+    xthickness	= 0
+    ythickness	= 0
+}
+
 style "menu"
 {
 	xthickness	= 0
@@ -2322,11 +2339,12 @@ class "GtkScrolledWindow"		style "scrolled_window"
 class "GtkFrame"	                style "frame"
 class "GtkToolbar"	                style "toolbar"
 
-widget_class "*<GtkMenuBar>*"			style "menubar"
 widget_class "*<GtkMenu>*"			style "menu"
 widget_class "*<GtkMenu>*"			style "menu_framed_box"
 widget_class "*<GtkMenuItem>*"			style "menu_item"
 widget_class "*<GtkMenuBar>.<GtkMenuItem>*"	style "menubar_item"
+widget_class "*<GtkMenuBar>"			style "menubar"
+widget_class "*<GtkMenuBar>*"			style "menubar_button"
 widget_class "*<GtkCheckButton>*"               style "checkbutton"
 widget_class "*<GtkComboBox>"                   style "combobox"
 widget_class "*<GtkComboBox>*<GtkButton>"       style "combobox_button"
@@ -2381,5 +2399,7 @@ class "GtkWindow"                             style "toplevel_hack"
 widget "*openoffice-toplevel*"                style "ooo_stepper_hack"
 widget "*openoffice-toplevel*GtkEntry"        style "libreoffice_entry"
 widget "*openoffice-toplevel*GtkSpinButton"   style "libreoffice_spinbutton_entry"
+widget "*openoffice-toplevel*GtkMenuBar*"    style "libreoffice_menubar_button"
 widget "*libreoffice-toplevel*GtkEntry"       style "libreoffice_entry"
 widget "*libreoffice-toplevel*GtkSpinButton"  style "libreoffice_spinbutton_entry"
+widget "*libreoffice-toplevel*GtkMenuBar*"    style "libreoffice_menubar_button"