[Xfce4-commits] r26370 - xfce4-panel/trunk/plugins/systray

[Nick Schermer]

Author: nick
Date: 2007-11-18 17:43:47 +0000 (Sun, 18 Nov 2007)
New Revision: 26370

Modified:
   xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c
   xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c
Log:
* Give icons all the panel size when the frame is disabled.


Modified: xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c
===================================================================
--- xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c	2007-11-18 17:19:08 UTC (rev 26369)
+++ xfce4-panel/trunk/plugins/systray/xfce-tray-dialogs.c	2007-11-18 17:43:47 UTC (rev 26370)
@@ -164,6 +164,7 @@
                                       XfceTrayPlugin  *plugin)
 {
     gboolean active;
+    gint     panel_size;
 
     /* get state */
     active = gtk_toggle_button_get_active (button);
@@ -173,6 +174,12 @@
 
     /* save */
     plugin->show_frame = active;
+
+    /* get the panel size */
+    panel_size = xfce_panel_plugin_get_size (plugin->panel_plugin);
+
+    /* emit size-changed signal */
+    g_signal_emit_by_name (G_OBJECT (plugin->panel_plugin), "size-changed", panel_size, &active);
 }
 
 

Modified: xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c
===================================================================
--- xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c	2007-11-18 17:19:08 UTC (rev 26369)
+++ xfce4-panel/trunk/plugins/systray/xfce-tray-plugin.c	2007-11-18 17:43:47 UTC (rev 26370)
@@ -244,7 +244,6 @@
 
     /* create tray widget */
     plugin->tray = xfce_tray_widget_new ();
-    gtk_container_set_border_width (GTK_CONTAINER (plugin->tray), 1);
     gtk_container_add (GTK_CONTAINER (plugin->frame), plugin->tray);
     gtk_widget_show (plugin->tray);
 
@@ -312,8 +311,9 @@
 xfce_tray_plugin_size_changed (XfceTrayPlugin *plugin,
                                guint           size)
 {
-    /* set the frame border size */
-    gtk_container_set_border_width (GTK_CONTAINER (plugin->frame), size > SMALL_PANEL_SIZE ? 1 : 0);
+    /* set the border sizes */
+    gtk_container_set_border_width (GTK_CONTAINER (plugin->frame), plugin->show_frame ? 1 : 0);
+    gtk_container_set_border_width (GTK_CONTAINER (plugin->tray), (size > SMALL_PANEL_SIZE && plugin->show_frame) ? 1 : 0);
 
     /* we handled the size of the plugin */
     return TRUE;