CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated indicator-applet

Browse source
This commit is contained in:
Rubén Rodríguez 2014-05-21 02:55:11 +02:00
parent 78028ba7a9
commit 91c5d53355
2 changed files with 84 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
helpers/DATA/indicator-applet/indicator-applet-scroll-arrows.patch
View file

@ -1,42 +1,36 @@
# Fixes https://bugs.launchpad.net/indicator-applet/+bug/965953
diff --git indicator-applet/src/applet-main.c indicator-applet/src/applet-main.c
--- indicator-applet/src/applet-main.c
+++ indicator-applet/src/applet-main.c
@@ -362,6 +362,24 @@ accessible_desc_update (IndicatorObject
--- indicator-applet-12.10.2+14.04.20140403/src/applet-main.c 2014-04-03 01:10:57.000000000 +0000
+++ indicator-applet-12.10.2+14.04.20140403.mod/src/applet-main.c 2014-05-20 21:34:34.856698376 +0000
@@ -364,6 +364,24 @@
return;
}
+static gboolean
+static void
+do_menu_reposition(gpointer menu)
+{
+ gtk_widget_set_size_request(menu, -1, -1);
+ gtk_widget_set_size_request(menu, 0,0);
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+ gtk_menu_reposition(menu);
+ g_timeout_add(20, (GSourceFunc) gtk_menu_reposition, (gpointer) menu);
+ g_timeout_add(20, (GSourceFunc) gtk_menu_reposition, (gpointer) menu);
+ return 0;
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+}
+
+static void
+on_menuitem_show (GtkMenuItem *menuitem, gpointer menu)
+{
+ gtk_widget_set_size_request(menu, -1, 500);
+ gtk_menu_reposition(menu);
+{
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu), NULL,NULL);
+ g_idle_add((GSourceFunc) do_menu_reposition, (gpointer) menu);
+}
+
static void
entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
static GtkWidget*
create_menuitem (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
{
@@ -435,6 +450,11 @@ entry_added (IndicatorObject * io, Indic
if (entry->menu != NULL) {
@@ -415,6 +433,7 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
+ g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(on_menuitem_show), entry->menu);
+ gtk_menu_set_reserve_toggle_size(entry->menu, TRUE);
+ gtk_widget_set_size_request(entry->menu, -1, -1);
+ gtk_widget_set_size_request(entry->menu, -1, 500);
+ gtk_menu_reposition(entry->menu);
}
+ g_signal_connect(G_OBJECT(entry->menu), "show", G_CALLBACK(on_menuitem_show), entry->menu);
place_in_menu(menubar, menuitem, io, entry);
return menuitem;

67
helpers/make-indicator-applet Normal file
View file

@ -0,0 +1,67 @@
#!/bin/sh
#
# Copyright (C) 2008-2010 Rubén Rodríguez <ruben@trisquel.info>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=2
. ./config
# Fixes https://bugs.launchpad.net/indicator-applet/+bug/965953
cat << EOF | patch -p1
--- indicator-applet-12.10.2+14.04.20140403/src/applet-main.c 2014-04-03 01:10:57.000000000 +0000
+++ indicator-applet-12.10.2+14.04.20140403.mod/src/applet-main.c 2014-05-20 21:34:34.856698376 +0000
@@ -364,6 +364,24 @@
return;
}
+static void
+do_menu_reposition(gpointer menu)
+{
+ gtk_widget_set_size_request(menu, 0,0);
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+ gtk_menu_reposition(menu);
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+}
+
+static void
+on_menuitem_show (GtkMenuItem *menuitem, gpointer menu)
+{
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu), NULL,NULL);
+ g_idle_add((GSourceFunc) do_menu_reposition, (gpointer) menu);
+}
+
static GtkWidget*
create_menuitem (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
{
@@ -415,6 +433,7 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entry->menu));
}
+ g_signal_connect(G_OBJECT(entry->menu), "show", G_CALLBACK(on_menuitem_show), entry->menu);
place_in_menu(menubar, menuitem, io, entry);
return menuitem;
EOF
changelog "Fixes LP:965953"
compile