Skip to content
Commits on Source (4)
commit bd51a4996142876d811e64a22c27e9042330e529
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Sep 25 23:56:16 2019 +0200
Updates for release
commit 81e790321ffd8ca3435fd7dc104855e4d8868a45
Author: Walter Cheuk <wwycheuk@gmail.com>
Date: Wed Sep 25 06:30:41 2019 +0200
I18n: Update translation zh_TW (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 6346ba9335a21f3b6ac5fd4828fda49c11f4e53b
Author: Walter Cheuk <wwycheuk@gmail.com>
Date: Tue Sep 24 12:30:54 2019 +0200
I18n: Update translation zh_TW (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit ae17af3ca4779d3b4e4b5684eba0466505879209
Author: Zmicer Turok <nashtlumach@gmail.com>
Date: Tue Sep 24 12:30:54 2019 +0200
I18n: Update translation be (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit d6ecf17728e9e6a07b8fbecac76910c76e5db105
Author: Dušan Kazik <prescott66@gmail.com>
Date: Sat Sep 21 00:31:05 2019 +0200
I18n: Update translation sk (97%).
402 translated messages, 11 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit beffb1df46e5cf10abc9a94471fefe1e418f02ff
Author: Dušan Kazik <prescott66@gmail.com>
Date: Tue Sep 17 12:30:33 2019 +0200
I18n: Update translation sk (97%).
401 translated messages, 12 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 4bad6b334df63eb97930529af56772e83e6bb3a0
Author: Theppitak Karoonboonyanan <theppitak@gmail.com>
Date: Mon Sep 16 06:30:59 2019 +0200
I18n: Update translation th (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 2bc96e34f8fbb0c9659a6693fe2538096fb3ac13
Author: Stefan Höök <stefan.hook@gmail.com>
Date: Sat Sep 14 00:30:42 2019 +0200
I18n: Update translation sv (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 583332ef67e66a3ac7cc40ced953dfae7e0d85ad
Author: Anonymous <noreply@xfce.org>
Date: Fri Sep 6 18:30:48 2019 +0200
I18n: Update translation el (99%).
412 translated messages, 1 untranslated message.
Transifex (https://www.transifex.com/xfce/public/).
commit fc1eed038cbe93d1cb952f715f03b44139dee37c
Author: tap saja <tapsaja@gmail.com>
Date: Thu Sep 5 12:30:32 2019 +0200
I18n: Update translation id (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit e13629d93a8ebd83291a07bc0d2325c917398632
Author: abuyop <abuyop@gmail.com>
Date: Mon Sep 2 18:31:09 2019 +0200
I18n: Update translation ms (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 641a38f9cbaa9b390be7880193517679d5515ebc
Author: 玉堂白鹤 <yjwork@qq.com>
Date: Mon Sep 2 12:31:18 2019 +0200
I18n: Update translation zh_CN (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 236fb1e608cca16f1e8cc92a090011f36bcc3460
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Fri Aug 30 12:31:14 2019 +0200
I18n: Update translation gl (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit c1e4a45fe03ffe081e315f971e53f0e15b22b895
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Fri Aug 23 18:31:26 2019 +0200
I18n: Update translation gl (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 73a8360302a70eba9940d9cda17c4899b9e21b55
Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Date: Wed Aug 21 06:30:38 2019 +0200
I18n: Update translation ja (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 6e20267e67b5601ebd105651c6f715b6c5707441
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Aug 21 18:16:09 2019 +0200
windowlist: Make layout consistent with xfdesktop
commit b3c4a13dd84a5c60c333ca6610bc8089812a33cb
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Aug 21 18:10:24 2019 +0200
windowmenu: Replace deprecated gtk_widget_modify_font
commit 3a97cd1ccd96d8593b8b668a76bbfc949a4d9590
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu Sep 19 14:40:57 2019 +0200
Draw panel border based on position and length
Previously we chose a more simplistic approach - not taking the panel
length into account - which resulted e.g. in the default layout in the
bottom panel not having a left and right border drawn, despite it not
having 100% width.
Also: Fix a leak (not freeing the border_side gchar).
commit 51d1249cbfed20b57dc8e6e7c5e84f1df522c556
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sat Jul 13 23:17:26 2019 +0200
tasklist: Resize when windows get removed (Bug #14394)
The idea is to do what is also done for the window-added signal.
commit 820de57c44c381e47091d3a7e214852bf8fafb53
Author: Ivan A. Melnikov <iv@altlinux.org>
Date: Mon Sep 23 16:18:10 2019 +0400
systray: Fix icons without compositing (Bug #14577)
Wrapper window uses RGBA visual when it's available;
systray manager should try to do the same for
the transparent or parent-relative background to work.
That means that the manager and icons will work with
RGBA visual even if the screen is not compositing; so
we should always force-redraw the icons.
Refs: https://bugzilla.xfce.org/show_bug.cgi?id=14577
Signed-off-by: Ivan A. Melnikov <iv@altlinux.org>
commit 55dc7b400feef0c35fda3e8d3515dada2ced29c4
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Thu Aug 15 23:27:25 2019 +0200
pager: Fix scrolling in pager-buttons (Bug #15614)
Unfortunately this doesn't affect the miniature view (aka WnckPager),
where scrolling is handled natively and in a different - broken - order.
commit 1cad3ae954f46dd63426b6565afc51c8bdb6b45d
Author: Piotr Sokół <psokol.l10n@gmail.com>
Date: Sun Aug 18 00:30:55 2019 +0200
I18n: Update translation pl (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 7a20445b540bd605009727002b4babad997eab0f
Author: Elishai Eliyahu <e1907@mm.st>
Date: Sun Aug 18 00:30:55 2019 +0200
I18n: Update translation he (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 8dcb8ee646d0e466b5dc8ed7535867b21c94cf36
Author: Daniel Muñiz Fontoira <dani@damufo.com>
Date: Sat Aug 17 18:31:09 2019 +0200
I18n: Update translation gl (100%).
413 translated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit ad42af93bab16c8cd473d2ea66d4e70f84035dbb
Author: clmmbs <msreywel@hotmail.com>
Date: Sat Aug 17 18:31:09 2019 +0200
I18n: Update translation ar (93%).
388 translated messages, 25 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 29cf0cc6397167426fa22a10c2ab09e44a262857
Author: Саша Петровић <salepetronije@gmail.com>
Date: Thu Aug 15 00:30:34 2019 +0200
I18n: Update translation sr (99%).
412 translated messages, 1 untranslated message.
Transifex (https://www.transifex.com/xfce/public/).
commit 8e900e817a0891a43b05c189f20390e267398a11
Author: Besnik <besnik@programeshqip.org>
Date: Wed Aug 14 18:30:52 2019 +0200
I18n: Update translation sq (97%).
401 translated messages, 12 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
commit 76c10ece7d93dc822bfc20389b17b29b9b70a270
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Wed Aug 14 16:37:13 2019 +0200
launcher: Fix visual state of arrow-button (Bug #15818)
For some reason the "hover" (aka PRELIGHT) state remains after closing
the menu. Manually resetting it helps.
commit 56877ac8eaa5f00cb38fb386ffabe95dff283518
Author: Real School <translator_students@realschool.am>
Date: Wed Aug 14 12:30:35 2019 +0200
I18n: Update translation hy_AM (99%).
412 translated messages, 1 untranslated message.
Transifex (https://www.transifex.com/xfce/public/).
commit ae4ed68b248df16fb0fdf625acc785ae73ef24cf
Author: Andre Miranda <andreldm@xfce.org>
Date: Wed Aug 14 00:29:11 2019 -0300
launcher: Avoid excessive left padding on popup menu (Bug #15819)
commit 58f09ae8d9f10f9454a3df667d37803cfb15d4fe
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sun Aug 11 23:13:56 2019 +0200
Back to development
commit 8980371d80e7be81392ccba4bde5f7bca71ff037
Author: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sun Aug 11 23:10:56 2019 +0200
Updates for release
commit cfdf495627b699d7cb8aa349bf35ef5c3d4a1a2b
Author: Kjell Cato Heskjestad <cato@heskjestad.xyz>
Date: Sun Aug 11 12:30:40 2019 +0200
......
4.14.1
======
- Draw panel border based on position and length
- windowlist: Make layout consistent with xfdesktop
- windowmenu: Replace deprecated gtk_widget_modify_font
- tasklist: Resize when windows get removed (Bug #14394)
- systray: Fix icons without compositing (Bug #14577)
- pager: Fix scrolling in pager-buttons (Bug #15614)
- launcher: Fix visual state of arrow-button (Bug #15818)
- launcher: Avoid excessive left padding on popup menu (Bug #15819)
- Translation Updates:
Albanian, Arabic, Armenian (Armenia), Belarusian, Chinese (China),
Chinese (Taiwan), Galician, Greek, Hebrew, Indonesian, Japanese, Malay,
Polish, Serbian, Slovak, Swedish, Thai
4.14.0
======
- tasklist: Keep panel visible on drag and drop (Bug #15703)
......
......@@ -54,7 +54,8 @@ static const GDebugKey panel_debug_keys[] =
{ "positioning", PANEL_DEBUG_POSITIONING },
{ "struts", PANEL_DEBUG_STRUTS },
{ "systray", PANEL_DEBUG_SYSTRAY },
{ "tasklist", PANEL_DEBUG_TASKLIST }
{ "tasklist", PANEL_DEBUG_TASKLIST },
{ "pager", PANEL_DEBUG_PAGER }
};
......
......@@ -42,7 +42,8 @@ typedef enum
PANEL_DEBUG_POSITIONING = 1 << 12,
PANEL_DEBUG_STRUTS = 1 << 13,
PANEL_DEBUG_SYSTRAY = 1 << 14,
PANEL_DEBUG_TASKLIST = 1 << 15
PANEL_DEBUG_TASKLIST = 1 << 15,
PANEL_DEBUG_PAGER = 1 << 16
}
PanelDebugFlag;
......
#! /bin/sh
# From configure.ac cfdf4956.
# From configure.ac bd51a499.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xfce4-panel 4.14.0.
# Generated by GNU Autoconf 2.69 for xfce4-panel 4.14.1.
#
# Report bugs to <http://bugzilla.xfce.org/>.
#
......@@ -597,8 +597,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xfce4-panel'
PACKAGE_TARNAME='xfce4-panel'
PACKAGE_VERSION='4.14.0'
PACKAGE_STRING='xfce4-panel 4.14.0'
PACKAGE_VERSION='4.14.1'
PACKAGE_STRING='xfce4-panel 4.14.1'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
 
......@@ -1531,7 +1531,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xfce4-panel 4.14.0 to adapt to many kinds of systems.
\`configure' configures xfce4-panel 4.14.1 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1606,7 +1606,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xfce4-panel 4.14.0:";;
short | recursive ) echo "Configuration of xfce4-panel 4.14.1:";;
esac
cat <<\_ACEOF
 
......@@ -1764,7 +1764,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xfce4-panel configure 4.14.0
xfce4-panel configure 4.14.1
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2139,7 +2139,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by xfce4-panel $as_me 4.14.0, which was
It was created by xfce4-panel $as_me 4.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -3007,7 +3007,7 @@ fi
 
# Define the identity of the package.
PACKAGE='xfce4-panel'
VERSION='4.14.0'
VERSION='4.14.1'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -13914,11 +13914,11 @@ CC=$lt_save_CC
LIBXFCE4PANEL_VERINFO=4:0:0
 
 
LIBXFCE4PANEL_VERSION=4.14.0
LIBXFCE4PANEL_VERSION=4.14.1
LIBXFCE4PANEL_VERSION_API=2.0
LIBXFCE4PANEL_VERSION_MAJOR=4
LIBXFCE4PANEL_VERSION_MINOR=14
LIBXFCE4PANEL_VERSION_MICRO=0
LIBXFCE4PANEL_VERSION_MICRO=1
 
$as_echo "#define LIBXFCE4PANEL_VERSION_API \"2.0\"" >>confdefs.h
 
......@@ -20172,7 +20172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xfce4-panel $as_me 4.14.0, which was
This file was extended by xfce4-panel $as_me 4.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -20238,7 +20238,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
xfce4-panel config.status 4.14.0
xfce4-panel config.status 4.14.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......
......@@ -18,9 +18,9 @@ m4_define([libxfce4panel_version_api], [2.0])
m4_define([xfce4_panel_config_version], [2])
m4_define([xfce4_panel_version_major], [4])
m4_define([xfce4_panel_version_minor], [14])
m4_define([xfce4_panel_version_micro], [0])
m4_define([xfce4_panel_version_micro], [1])
m4_define([xfce4_panel_version_nano], []) dnl leave this empty to have no nano version
m4_define([xfce4_panel_version_build], [cfdf4956])
m4_define([xfce4_panel_version_build], [bd51a499])
m4_define([xfce4_panel_version_tag], [])
m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [git], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
......
xfce4-panel (4.14.1-1) unstable; urgency=medium
* New upstream version 4.14.1
-- Yves-Alexis Perez <corsac@debian.org> Thu, 26 Sep 2019 17:48:57 +0200
xfce4-panel (4.14.0-1) unstable; urgency=medium
[ Unit 193 ]
......
......@@ -20,7 +20,7 @@
</h3>
<div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:nick@xfce.org">nick@xfce.org</a>&gt;</code></p></div></div>
</div></div></div>
<div><p class="releaseinfo">Version 4.14.0
<div><p class="releaseinfo">Version 4.14.1
</p></div>
<div><p class="copyright">Copyright © 2006, 2007 Jasper Huijsmans</p></div>
<div><p class="copyright">Copyright © 2008, 2010 Nick Schermer</p></div>
......
......@@ -262,7 +262,7 @@ version of the libxfce4panel headers you have included.</p>
<hr>
<div class="refsect2">
<a name="LIBXFCE4PANEL-VERSION:CAPS"></a><h3>LIBXFCE4PANEL_VERSION</h3>
<pre class="programlisting">#define LIBXFCE4PANEL_VERSION ("4.14.0")
<pre class="programlisting">#define LIBXFCE4PANEL_VERSION ("4.14.1")
</pre>
<p>String with the full version of the panel.</p>
<p class="since">Since: <a class="link" href="api-index-4-8.html#api-index-4.8">4.8</a></p>
......@@ -292,7 +292,7 @@ linked against at application run time.</p>
<hr>
<div class="refsect2">
<a name="LIBXFCE4PANEL-MICRO-VERSION:CAPS"></a><h3>LIBXFCE4PANEL_MICRO_VERSION</h3>
<pre class="programlisting">#define LIBXFCE4PANEL_MICRO_VERSION (0)
<pre class="programlisting">#define LIBXFCE4PANEL_MICRO_VERSION (1)
</pre>
<p>The micro version number of the libxfce4panel library.
Like libxfce4panel_micro_version, but from the headers used at
......
......@@ -34,7 +34,7 @@ G_BEGIN_DECLS
*
* Since: 4.8
**/
#define LIBXFCE4PANEL_VERSION ("4.14.0")
#define LIBXFCE4PANEL_VERSION ("4.14.1")
/**
* LIBXFCE4PANEL_MAJOR_VERSION:
......@@ -70,7 +70,7 @@ G_BEGIN_DECLS
*
* Since: 4.8
**/
#define LIBXFCE4PANEL_MICRO_VERSION (0)
#define LIBXFCE4PANEL_MICRO_VERSION (1)
/**
* LIBXFCE4PANEL_CHECK_VERSION:
......
......@@ -653,25 +653,30 @@ panel_base_window_reset_background_css (PanelBaseWindow *window) {
gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
GTK_STYLE_PROPERTY_BACKGROUND_COLOR,
&background_rgba, NULL);
if (PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_BOTTOM))
border_side = "bottom";
else if (PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_TOP))
border_side = "top";
else if (PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_LEFT))
border_side = "left";
else if (PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_RIGHT))
border_side = "right";
if (border_side) {
/* Set correct border style depending on panel position and length */
if (priv->borders != PANEL_BORDER_NONE)
{
border_side = g_strdup_printf ("%s %s %s %s",
PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_TOP) ? "solid" : "none",
PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_RIGHT) ? "solid" : "none",
PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_BOTTOM) ? "solid" : "none",
PANEL_HAS_FLAG (priv->borders, PANEL_BORDER_LEFT) ? "solid" : "none");
}
if (border_side)
{
color_text = gdk_rgba_to_string (background_rgba);
base_css = g_strdup_printf ("%s .xfce4-panel.background { border-%s: 1px solid shade(%s, 0.7); }",
base_css = g_strdup_printf ("%s .xfce4-panel.background { border-style: %s; border-width: 1px; border-color: shade(%s, 0.7); }",
PANEL_BASE_CSS, border_side, color_text);
gtk_css_provider_load_from_data (window->priv->css_provider, base_css, -1, NULL);
g_free (base_css);
g_free (color_text);
g_free (border_side);
}
else
gtk_css_provider_load_from_data (window->priv->css_provider, PANEL_BASE_CSS, -1, NULL);
gtk_style_context_add_provider (context,
GTK_STYLE_PROVIDER (window->priv->css_provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
......
......@@ -1483,6 +1483,7 @@ launcher_plugin_menu_deactivate (GtkWidget *menu,
/* deactivate the arrow button */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (plugin->arrow), FALSE);
gtk_widget_unset_state_flags (GTK_WIDGET (plugin->arrow), GTK_STATE_FLAG_PRELIGHT);
}
......@@ -1574,6 +1575,7 @@ launcher_plugin_menu_item_drag_data_received (GtkWidget *widget,
/* inactivate the toggle button */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (plugin->arrow), FALSE);
gtk_widget_unset_state_flags (GTK_WIDGET (plugin->arrow), GTK_STATE_FLAG_PRELIGHT);
/* finish the drag */
gtk_drag_finish (context, TRUE, FALSE, drag_time);
......@@ -1596,6 +1598,7 @@ launcher_plugin_menu_construct (LauncherPlugin *plugin)
/* create a new menu */
plugin->menu = gtk_menu_new ();
gtk_menu_set_reserve_toggle_size (GTK_MENU (plugin->menu), FALSE);
gtk_menu_attach_to_widget (GTK_MENU (plugin->menu), GTK_WIDGET (plugin), NULL);
g_signal_connect (G_OBJECT (plugin->menu), "deactivate",
G_CALLBACK (launcher_plugin_menu_deactivate), plugin);
......@@ -1618,7 +1621,7 @@ launcher_plugin_menu_construct (LauncherPlugin *plugin)
mi = gtk_menu_item_new ();
label = gtk_label_new (panel_str_is_empty (name) ? _("Unnamed Item") : name);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (mi), box);
g_object_set_qdata (G_OBJECT (mi), launcher_plugin_quark, plugin);
......@@ -1743,6 +1746,7 @@ launcher_plugin_menu_destroy (LauncherPlugin *plugin)
/* deactivate the toggle button */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (plugin->arrow), FALSE);
gtk_widget_unset_state_flags (GTK_WIDGET (plugin->arrow), GTK_STATE_FLAG_PRELIGHT);
}
}
......
......@@ -368,6 +368,7 @@ pager_buttons_rebuild_idle (gpointer user_data)
vp_info[VIEWPORT_Y] = (n / (workspace_height / screen_height)) * screen_height;
button = xfce_panel_create_toggle_button ();
gtk_widget_add_events (GTK_WIDGET (button), GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK);
if (viewport_x >= vp_info[VIEWPORT_X] && viewport_x < vp_info[VIEWPORT_X] + screen_width
&& viewport_y >= vp_info[VIEWPORT_Y] && viewport_y < vp_info[VIEWPORT_Y] + screen_height)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
......@@ -410,6 +411,7 @@ pager_buttons_rebuild_idle (gpointer user_data)
workspace = WNCK_WORKSPACE (li->data);
button = xfce_panel_create_toggle_button ();
gtk_widget_add_events (GTK_WIDGET (button), GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK);
if (workspace == active_ws)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_signal_connect (G_OBJECT (button), "toggled",
......
......@@ -32,6 +32,7 @@
#include <common/panel-xfconf.h>
#include <common/panel-utils.h>
#include <common/panel-private.h>
#include <common/panel-debug.h>
#include <libwnck/libwnck.h>
#include "pager.h"
......@@ -325,6 +326,7 @@ pager_plugin_scroll_event (GtkWidget *widget,
WnckWorkspace *new_ws;
gint active_n;
gint n_workspaces;
GdkScrollDirection scrolling_direction;
panel_return_val_if_fail (WNCK_IS_SCREEN (plugin->wnck_screen), FALSE);
......@@ -332,11 +334,27 @@ pager_plugin_scroll_event (GtkWidget *widget,
if (plugin->scrolling == FALSE)
return TRUE;
if (event->direction != GDK_SCROLL_SMOOTH)
scrolling_direction = event->direction;
else if (event->delta_y < 0)
scrolling_direction = GDK_SCROLL_UP;
else if (event->delta_y > 0)
scrolling_direction = GDK_SCROLL_DOWN;
else if (event->delta_x < 0)
scrolling_direction = GDK_SCROLL_LEFT;
else if (event->delta_x > 0)
scrolling_direction = GDK_SCROLL_RIGHT;
else
{
panel_debug_filtered (PANEL_DEBUG_PAGER, "Scrolling event with no delta happened.");
return TRUE;
}
active_ws = wnck_screen_get_active_workspace (plugin->wnck_screen);
active_n = wnck_workspace_get_number (active_ws);
if (event->direction == GDK_SCROLL_UP
|| event->direction == GDK_SCROLL_LEFT)
if (scrolling_direction == GDK_SCROLL_UP
|| scrolling_direction == GDK_SCROLL_LEFT)
active_n--;
else
active_n++;
......
......@@ -751,6 +751,7 @@ static void
systray_manager_set_visual (SystrayManager *manager)
{
GdkDisplay *display;
GdkVisual *visual;
Visual *xvisual;
Atom visual_atom;
gulong data[1];
......@@ -768,11 +769,12 @@ systray_manager_set_visual (SystrayManager *manager)
visual_atom = gdk_x11_get_xatom_by_name_for_display (display,
"_NET_SYSTEM_TRAY_VISUAL");
if (gdk_screen_is_composited (gtk_widget_get_screen (manager->invisible))
&& (gdk_screen_get_rgba_visual (screen) != NULL))
visual = gdk_screen_get_rgba_visual (screen);
panel_debug (PANEL_DEBUG_SYSTRAY, "rgba visual is %p", visual);
if (visual != NULL)
{
/* get the rgba visual */
xvisual = GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen));
/* use the rgba visual */
xvisual = GDK_VISUAL_XVISUAL (visual);
}
else
{
......
......@@ -728,19 +728,9 @@ systray_plugin_box_draw (GtkWidget *box,
gpointer user_data)
{
SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (user_data);
GdkScreen *screen;
panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin));
panel_return_if_fail (cr != NULL);
screen = gtk_widget_get_screen (GTK_WIDGET (plugin));
if (G_LIKELY (screen != NULL))
{
if (!gdk_screen_is_composited (screen))
return;
}
/* separately draw all the composed tray icons after gtk
* handled the draw event */
gtk_container_foreach (GTK_CONTAINER (box),
......
......@@ -1946,6 +1946,8 @@ xfce_tasklist_window_removed (WnckScreen *screen,
break;
}
}
gtk_widget_queue_resize (GTK_WIDGET (tasklist));
}
......
......@@ -853,9 +853,10 @@ window_menu_plugin_menu_workspace_item_active (GtkWidget *mi,
static GtkWidget *
window_menu_plugin_menu_workspace_item_new (WnckWorkspace *workspace,
WindowMenuPlugin *plugin,
PangoFontDescription *bold)
gboolean bold)
{
const gchar *name;
gchar *label_text = NULL;
gchar *utf8 = NULL, *name_num = NULL;
GtkWidget *mi, *label;
......@@ -881,10 +882,18 @@ window_menu_plugin_menu_workspace_item_new (WnckWorkspace *workspace,
panel_return_val_if_fail (GTK_IS_LABEL (label), NULL);
gtk_label_set_ellipsize (GTK_LABEL (label), plugin->ellipsize_mode);
gtk_label_set_max_width_chars (GTK_LABEL (label), plugin->max_width_chars);
gtk_label_set_xalign (GTK_LABEL (label), 0.5);
/* modify the label font if needed */
if (bold != NULL)
gtk_widget_modify_font (label, bold);
if (bold)
label_text = g_strdup_printf ("<b>%s</b>", name);
else
label_text = g_strdup_printf ("<i>%s</i>", name);
if (label_text)
{
gtk_label_set_markup (GTK_LABEL (label), label_text);
g_free (label_text);
}
g_free (utf8);
g_free (name_num);
......@@ -967,6 +976,7 @@ window_menu_plugin_menu_window_item_new (WnckWindow *window,
gint icon_h)
{
const gchar *name, *tooltip;
gchar *label_text = NULL;
gchar *utf8 = NULL;
gchar *decorated = NULL;
GtkWidget *mi, *label, *image;
......@@ -1006,14 +1016,19 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/* make the label pretty on long window names */
label = gtk_bin_get_child (GTK_BIN (mi));
panel_return_val_if_fail (GTK_IS_LABEL (label), NULL);
gtk_label_set_ellipsize (GTK_LABEL (label), plugin->ellipsize_mode);
gtk_label_set_max_width_chars (GTK_LABEL (label), plugin->max_width_chars);
/* modify the label font if needed */
if (wnck_window_is_active (window))
gtk_widget_modify_font (label, italic);
label_text = g_strdup_printf ("<b><i>%s</i></b>", name);
else if (wnck_window_or_transient_needs_attention (window))
gtk_widget_modify_font (label, bold);
label_text = g_strdup_printf ("<b>%s</b>", name);
if (label_text)
{
gtk_label_set_markup (GTK_LABEL (label), label_text);
g_free (label_text);
}
gtk_label_set_ellipsize (GTK_LABEL (label), plugin->ellipsize_mode);
gtk_label_set_max_width_chars (GTK_LABEL (label), plugin->max_width_chars);
if (plugin->minimized_icon_lucency > 0)
{
......@@ -1204,11 +1219,7 @@ window_menu_plugin_menu_new (WindowMenuPlugin *plugin)
{
/* create the workspace menu item */
mi = window_menu_plugin_menu_workspace_item_new (workspace, plugin,
workspace == active_workspace ? bold : italic);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
gtk_widget_show (mi);
mi = gtk_separator_menu_item_new ();
workspace == active_workspace);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
gtk_widget_show (mi);
......@@ -1251,13 +1262,10 @@ window_menu_plugin_menu_new (WindowMenuPlugin *plugin)
urgent_windows++;
}
if (has_windows)
{
mi = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
gtk_widget_show (mi);
}
}
/* destroy the last menu item if it's a separator */
if (mi != NULL && GTK_IS_SEPARATOR_MENU_ITEM (mi))
......
This diff is collapsed.