- updated for gnome-panel-2.6.2

[packages/gnome-panel.git] / gnome-panel-menu-stripe.patch

diff -urN aa/gnome-panel-2.6.0/gnome-panel/Makefile.am gnome-panel-2.6.0/gnome-panel/Makefile.am
--- aa/gnome-panel-2.6.0/gnome-panel/Makefile.am	2004-02-06 17:04:50.000000000 +0100
+++ gnome-panel-2.6.0/gnome-panel/Makefile.am	2004-03-27 00:29:00.520061944 +0100
@@ -80,6 +80,8 @@
 	panel-typebuiltins.h	\
 	panel-marshal.c		\
 	panel-marshal.h		\
+	panel-menu.c		\
+	panel-menu.h		\
 	main.c			\
 	panel-widget.c  	\
 	button-widget.c  	\
diff -urN aa/gnome-panel-2.6.0/gnome-panel/menu.c gnome-panel-2.6.0/gnome-panel/menu.c
--- aa/gnome-panel-2.6.0/gnome-panel/menu.c	2004-03-09 11:08:47.000000000 +0100
+++ gnome-panel-2.6.0/gnome-panel/menu.c	2004-03-27 00:29:00.522061640 +0100
@@ -44,6 +44,7 @@
 #include "menu-fentry.h"
 #include "menu-util.h"
 #include "menu-ditem.h"
+#include "panel-menu.h"
 #include "panel-util.h"
 #include "panel-gconf.h"
 #include "panel.h"
@@ -67,6 +68,7 @@
 #include "panel-lockdown.h"
 
 #undef MENU_DEBUG
+#define MENU_SNAP_LENGTH 10
 
 static char *gnome_folder = NULL;
 
@@ -614,6 +616,9 @@
 	if (repo->orig_func != NULL) {
 		repo->orig_func (menu, x, y, push_in, repo->orig_data);
 
+		if (*x < MENU_SNAP_LENGTH)
+		  *x = 0;
+
 		if (menu->parent_menu_item != NULL) {
 			/* This is a submenu so behave submenuish */
 			if (*x < monitor_basex ||
@@ -709,8 +714,8 @@
 	reload_image_menu_items ();
 }
 
-GtkWidget *
-panel_create_menu (void)
+static GtkWidget *
+panel_create_menu_of_type (GType menu_type)
 {
 	GtkWidget       *retval;
 	static gboolean  registered_icon_theme_changer = FALSE;
@@ -722,8 +727,7 @@
 				  G_CALLBACK (icon_theme_changed), NULL);
 	}
 	
-	retval = gtk_menu_new ();
-	
+	retval = g_object_new (menu_type, NULL);
 	panel_gconf_notify_add_while_alive ("/desktop/gnome/interface/menus_have_icons",
 					    (GConfClientNotifyFunc) menus_have_icons_changed,
 					    G_OBJECT (retval));
@@ -739,12 +743,18 @@
 	return retval;
 }
 
+GtkWidget *
+panel_create_menu (void)
+{
+        return panel_create_menu_of_type (gtk_menu_get_type());
+}
+
 static GtkWidget *
-menu_new (void)
+menu_new_of_type (GType menu_type)
 {
 	GtkWidget *retval;
 
-	retval = panel_create_menu ();
+	retval = panel_create_menu_of_type (menu_type);
 
 	g_signal_connect (
 		retval, "show", G_CALLBACK (setup_menu_panel), NULL);
@@ -752,6 +762,13 @@
 	return retval;
 }
 
+static GtkWidget *
+menu_new (void)
+{
+       return menu_new_of_type (gtk_menu_get_type ());
+}
+
+
 static void
 icon_to_load_free (IconToLoad *icon)
 {
@@ -3314,7 +3331,7 @@
 	}
 
 	if (!root_menu)
-		root_menu = menu_new ();
+		root_menu = menu_new_of_type (panel_menu_get_type ());
 
 	g_object_set_data (G_OBJECT (root_menu), "menu_panel", panel);
 
diff -urN aa/gnome-panel-2.6.0/gnome-panel/panel-config-global.c gnome-panel-2.6.0/gnome-panel/panel-config-global.c
--- aa/gnome-panel-2.6.0/gnome-panel/panel-config-global.c	2004-01-18 15:35:47.000000000 +0100
+++ gnome-panel-2.6.0/gnome-panel/panel-config-global.c	2004-03-27 00:29:00.523061488 +0100
@@ -45,6 +45,7 @@
 	guint               drawer_auto_close : 1;
 	guint               confirm_panel_remove : 1;
 	guint               highlight_when_over : 1;
+	guint               menu_stripe : 1;
 } GlobalConfig;
 
 static GlobalConfig global_config = { 0, };
@@ -94,6 +95,13 @@
 
 	return global_config.confirm_panel_remove;
 }
+gboolean
+panel_global_config_get_menu_stripe (void)
+{
+	g_assert (global_config_initialised == TRUE);
+
+	return global_config.menu_stripe;
+}
 
 static void
 panel_global_config_set_entry (GConfEntry *entry)
@@ -151,6 +159,11 @@
 	else if (strcmp (key, "highlight_launchers_on_mouseover") == 0)
 		global_config.highlight_when_over =
 			gconf_value_get_bool (value);
+
+  else if (strcmp (key, "show_menu_stripe") == 0)
+    global_config.menu_stripe =
+        gconf_value_get_bool (value);
+
 }
 
 static void
diff -urN aa/gnome-panel-2.6.0/gnome-panel/panel-config-global.h gnome-panel-2.6.0/gnome-panel/panel-config-global.h
--- aa/gnome-panel-2.6.0/gnome-panel/panel-config-global.h	2004-01-18 15:32:28.000000000 +0100
+++ gnome-panel-2.6.0/gnome-panel/panel-config-global.h	2004-03-27 00:29:00.523061488 +0100
@@ -37,6 +37,7 @@
 gboolean panel_global_config_get_drawer_auto_close    (void);
 gboolean panel_global_config_get_tooltips_enabled     (void);
 gboolean panel_global_config_get_confirm_panel_remove (void);
+gboolean panel_global_config_get_menu_stripe	      (void);
 
 G_END_DECLS
 
diff -urN aa/gnome-panel-2.6.0/gnome-panel/panel-global.schemas.in gnome-panel-2.6.0/gnome-panel/panel-global.schemas.in
--- aa/gnome-panel-2.6.0/gnome-panel/panel-global.schemas.in	2004-01-18 16:10:23.000000000 +0100
+++ gnome-panel-2.6.0/gnome-panel/panel-global.schemas.in	2004-03-27 00:29:00.588051608 +0100
@@ -93,6 +93,18 @@
       </schema>
 
       <schema>
+        <key>/schemas/apps/panel/global/show_menu_stripe</key>
+        <applyto>/apps/panel/global/show_menu_stripe</applyto>
+        <owner>panel</owner>
+        <type>bool</type>
+        <default>true</default>
+        <locale name="C">
+          <short></short>
+          <long></long>
+        </locale>
+      </schema>
+
+      <schema>
         <key>/schemas/apps/panel/global/enable_key_bindings</key>
         <applyto>/apps/panel/global/enable_key_bindings</applyto>
         <owner>panel</owner>
diff -urN aa/gnome-panel-2.6.0/gnome-panel/panel-menu.c gnome-panel-2.6.0/gnome-panel/panel-menu.c
--- aa/gnome-panel-2.6.0/gnome-panel/panel-menu.c	1970-01-01 01:00:00.000000000 +0100
+++ gnome-panel-2.6.0/gnome-panel/panel-menu.c	2004-03-27 00:49:47.929426896 +0100
@@ -0,0 +1,1082 @@
+/*
+ * To set this up insert something like this in your ~/.gtkrc-2.0
+ *
+ * Copyright (C) 2002 Ximian, Inc. 
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 1997-2000 Dan Pascu and Alfredo Kojima