Advertisement
Guest User

Untitled

a guest
Jun 22nd, 2017
54
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.27 KB | None | 0 0
  1. diff --git a/configure.ac.in b/configure.ac.in
  2. index 9012783..40b8806 100644
  3. --- a/configure.ac.in
  4. +++ b/configure.ac.in
  5. @@ -45,7 +45,7 @@ AC_HEADER_STDC
  6. dnl ***********************************
  7. dnl *** Check for required packages ***
  8. dnl ***********************************
  9. -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.13.0])
  10. +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
  11. XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
  12. XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
  13. XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
  14. diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c
  15. index d3a4fad..2a3d252 100644
  16. --- a/panel-plugin/screenshooter-plugin.c
  17. +++ b/panel-plugin/screenshooter-plugin.c
  18. @@ -106,6 +106,31 @@ set_panel_button_tooltip (PluginData *pd);
  19.  
  20. /* Internal functions */
  21.  
  22. +/* Returns a preferred icon size
  23. +*/
  24. +static gint
  25. +get_preferred_icon_size (XfcePanelPlugin *plugin)
  26. +{
  27. +#if LIBXFCE4PANEL_CHECK_VERSION (4,13,0)
  28. + g_printf ("using 4.13\n");
  29. + return xfce_panel_plugin_get_icon_size (plugin);
  30. +#else
  31. + /* fall-back for older panel versions */
  32. + g_printf ("using 4.12\n");
  33. + gint width;
  34. + width = xfce_panel_plugin_get_size (plugin) / xfce_panel_plugin_get_nrows (plugin);
  35. +
  36. + if (width <= 27)
  37. + return 16;
  38. + else if (width < 34)
  39. + return 24;
  40. + else if (width < 40)
  41. + return 32;
  42. + else
  43. + return width;
  44. +#endif
  45. +}
  46. +
  47.  
  48.  
  49. /* Modify the size of the panel button
  50. @@ -122,7 +147,7 @@ cb_set_size (XfcePanelPlugin *plugin, int size, PluginData *pd)
  51. TRACE ("Request size for the plugin");
  52. gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
  53.  
  54. - icon_size = xfce_panel_plugin_get_icon_size (plugin);
  55. + icon_size = get_preferred_icon_size (plugin);
  56. gtk_image_set_pixel_size (GTK_IMAGE (pd->image), icon_size);
  57.  
  58. return TRUE;
  59. @@ -367,7 +392,7 @@ screenshooter_plugin_construct (XfcePanelPlugin *plugin)
  60. TRACE ("Create the panel button");
  61. pd->button = xfce_create_panel_button ();
  62.  
  63. - icon_size = xfce_panel_plugin_get_icon_size (plugin);
  64. + icon_size = get_preferred_icon_size (plugin);
  65. pd->image = gtk_image_new_from_icon_name (SCREENSHOT_ICON_NAME, icon_size);
  66.  
  67. gtk_container_add (GTK_CONTAINER (pd->button), GTK_WIDGET (pd->image));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement