Updating branch refs/heads/andrzejr/deskbar-github
to 315c5e37af56320a22fce38789cff290324f2486 (commit)
from 6a0f88a699f1b7bd272d62b80ffe4dd5b15d6469 (commit)
commit 315c5e37af56320a22fce38789cff290324f2486
Author: Andrzej <ndrwr...@gmail.com>
Date: Thu Nov 24 13:37:30 2011 +0900
pager: more fixes to the WNCK pager aspect ratio workaround.
Previous solution was failing when changing the number of rows of the WNCK
pager.
plugins/pager/pager.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 4da953b..a4f6904 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -404,20 +404,19 @@ pager_plugin_size_request (GtkWidget *widget,
XfcePanelPlugin *panel_plugin;
gboolean deskbar_mode;
GtkOrientation orientation;
- gint size;
plugin = XFCE_PAGER_PLUGIN (widget);
panel_plugin = XFCE_PANEL_PLUGIN (widget);
deskbar_mode = xfce_panel_plugin_get_deskbar_mode (panel_plugin);
orientation = xfce_panel_plugin_get_orientation (panel_plugin);
- size = xfce_panel_plugin_get_size (panel_plugin);
gtk_widget_size_request (plugin->pager, requisition);
if (plugin->miniature_view && deskbar_mode && orientation ==
GTK_ORIENTATION_VERTICAL)
{
/* Working around limitations of the wnck applet. */
/* Wnck assumes that a horizontal applet is always used in a horizontal
panel. */
- if (requisition->width && requisition->width > size)
+ /* Ignoring a special case of requisition size == 1 */
+ if (requisition->width > 1)
plugin->aspect = (double) requisition->height / (double)
requisition->width;
}
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
