[Xfce4-commits] r27090 - xfce4-settings/trunk/dialogs/appearance-settings
Author: stephan
Date: 2008-06-20 05:35:29 + (Fri, 20 Jun 2008)
New Revision: 27090
Modified:
xfce4-settings/trunk/dialogs/appearance-settings/main.c
Log:
Cleanup some allocs
Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-06-19
18:20:26 UTC (rev 27089)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-06-20
05:35:29 UTC (rev 27090)
@@ -491,6 +491,7 @@
GtkWidget *
appearance_settings_dialog_new_from_xml (GladeXML *gxml)
{
+GtkWidget *dialog;
PropertyPair *pair = NULL;
GtkTreeIter iter;
GtkListStore *list_store;
@@ -711,13 +712,15 @@
g_signal_connect (G_OBJECT(custom_dpi_check), "toggled",
G_CALLBACK(cb_custom_dpi_check_button_toggled), pair);
g_signal_connect (G_OBJECT(custom_dpi_spin), "value-changed",
G_CALLBACK(cb_custom_dpi_spin_value_changed), xsettings_channel);
-GtkWidget *dialog = glade_xml_get_widget (gxml,
"appearance-settings-dialog");
+dialog = glade_xml_get_widget (gxml, "appearance-settings-dialog");
+
return dialog;
}
int
main(int argc, char **argv)
{
+GtkWidget *dialog = NULL;
GladeXML *gxml;
GError *cli_error = NULL;
@@ -749,7 +752,7 @@
appearance_dialog_glade_length,
NULL, NULL);
-GtkWidget *dialog = appearance_settings_dialog_new_from_xml (gxml);
+dialog = appearance_settings_dialog_new_from_xml (gxml);
gtk_dialog_run(GTK_DIALOG(dialog));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27089 - in xfce4-mixer/trunk: . panel-plugin
Author: jannis
Date: 2008-06-19 18:20:26 + (Thu, 19 Jun 2008)
New Revision: 27089
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
xfce4-mixer/trunk/panel-plugin/xfce-volume-button.c
Log:
* panel-plugin/xfce-mixer-plugin.c: Try to start "xfce4-mixer"
when the plugin button is clicked.
Modified: xfce4-mixer/trunk/ChangeLog
===
--- xfce4-mixer/trunk/ChangeLog 2008-06-19 17:02:38 UTC (rev 27088)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-19 18:20:26 UTC (rev 27089)
@@ -1,5 +1,10 @@
2008-06-19 Jannis Pohlmann <[EMAIL PROTECTED]>
+ * panel-plugin/xfce-mixer-plugin.c: Try to start "xfce4-mixer"
+ when the plugin button is clicked.
+
+2008-06-19 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* Huge code reorganization: Split the mixer into three parts:
libxfce4mixer, xfce4-mixer and the panel plugin. libxfce4mixer
contains everything that's needed by both, the mixer and the
Modified: xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c
===
--- xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-19 17:02:38 UTC
(rev 27088)
+++ xfce4-mixer/trunk/panel-plugin/xfce-mixer-plugin.c 2008-06-19 18:20:26 UTC
(rev 27089)
@@ -53,12 +53,12 @@
static XfceMixerPlugin *xfce_mixer_plugin_new(XfcePanelPlugin
*plugin);
static void xfce_mixer_plugin_free (XfcePanelPlugin
*plugin,
XfceMixerPlugin
*mixer_plugin);
-static gboolean xfce_mixer_plugin_size_changed (XfcePanelPlugin
*plugin,
- gint
size,
- XfceMixerPlugin
*mixer_plugin);
-static void xfce_mixer_plugin_volume_changed (XfceVolumeButton
*button,
- gdouble
volume,
- XfceMixerPlugin
*mixer_plugin);
+static gboolean xfce_mixer_plugin_size_changed (XfceMixerPlugin
*mixer_plugin,
+ gint
size);
+static void xfce_mixer_plugin_volume_changed (XfceMixerPlugin
*mixer_plugin,
+ gdouble
volume);
+static void xfce_mixer_plugin_configure (XfceMixerPlugin
*mixer_plugin);
+static void xfce_mixer_plugin_clicked(XfceMixerPlugin
*mixer_plugin);
@@ -79,19 +79,23 @@
/* Store pointer to the panel plugin */
mixer_plugin->plugin = plugin;
- mixer_plugin->hvbox = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+ mixer_plugin->hvbox = GTK_WIDGET (xfce_hvbox_new
(GTK_ORIENTATION_HORIZONTAL, FALSE, 0));
+ xfce_panel_plugin_add_action_widget (plugin, mixer_plugin->hvbox);
gtk_container_add (GTK_CONTAINER (plugin), mixer_plugin->hvbox);
gtk_widget_show (mixer_plugin->hvbox);
mixer_plugin->button = xfce_volume_button_new ();
g_signal_connect (G_OBJECT (mixer_plugin->button), "volume-changed",
G_CALLBACK (xfce_mixer_plugin_volume_changed), mixer_plugin);
+ g_signal_connect_swapped (G_OBJECT (mixer_plugin->button), "clicked",
G_CALLBACK (xfce_mixer_plugin_clicked), mixer_plugin);
gtk_container_add (GTK_CONTAINER (mixer_plugin->hvbox),
mixer_plugin->button);
gtk_widget_show (mixer_plugin->button);
+ xfce_panel_plugin_menu_show_configure (plugin);
+
/* Connect to plugin signals */
- g_signal_connect (G_OBJECT (plugin), "free-data", G_CALLBACK
(xfce_mixer_plugin_free), mixer_plugin);
- g_signal_connect (G_OBJECT (plugin), "size-changed", G_CALLBACK
(xfce_mixer_plugin_size_changed), mixer_plugin);
-// g_signal_connect (G_OBJECT (plugin), "configure", G_CALLBACK
(xfce_mixer_plugin_configure), mixer_plugin);
+ g_signal_connect_swapped (G_OBJECT (plugin), "free-data", G_CALLBACK
(xfce_mixer_plugin_free), mixer_plugin);
+ g_signal_connect_swapped (G_OBJECT (plugin), "size-changed", G_CALLBACK
(xfce_mixer_plugin_size_changed), mixer_plugin);
+ g_signal_connect_swapped (G_OBJECT (plugin), "configure", G_CALLBACK
(xfce_mixer_plugin_configure), mixer_plugin);
return mixer_plugin;
}
@@ -122,13 +126,11 @@
static gboolean
-xfce_mixer_plugin_size_changed (XfcePanelPlugin *plugin,
-gint size,
-XfceMixerPlugin *mixer_plugin)
+xfce_mixer_plugin_size_changed (XfceMixerPlugin *mixer_plugin,
+gint size)
{
GtkOrientation orientation;
- g_return_val_if_fail (plugin != NULL, FALSE);
g_return_val_if_fail (mixer_plugin != NULL, FALSE);
/* Determine the icon size for the volume button */
@@ -138,7
[Xfce4-commits] r27088 - in xfce4-settings/trunk: . dialogs/appearance-settings po
Author: stephan Date: 2008-06-19 17:02:38 + (Thu, 19 Jun 2008) New Revision: 27088 Removed: xfce4-settings/trunk/INSTALL xfce4-settings/trunk/dialogs/appearance-settings/valgrind-log xfce4-settings/trunk/po/.intltool-merge-cache Modified: xfce4-settings/trunk/po/POTFILES.in Log: Remove some files which were added accidentally Add some filenames to POTFILES.in Deleted: xfce4-settings/trunk/INSTALL Deleted: xfce4-settings/trunk/dialogs/appearance-settings/valgrind-log Deleted: xfce4-settings/trunk/po/.intltool-merge-cache Modified: xfce4-settings/trunk/po/POTFILES.in === --- xfce4-settings/trunk/po/POTFILES.in 2008-06-19 15:08:24 UTC (rev 27087) +++ xfce4-settings/trunk/po/POTFILES.in 2008-06-19 17:02:38 UTC (rev 27088) @@ -0,0 +1 @@ +dialogs/appearance-settings/appearance-dialog.glade ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27086 - xfce4-settings/trunk/xfce4-settings-manager
Author: kelnos
Date: 2008-06-19 08:18:09 + (Thu, 19 Jun 2008)
New Revision: 27086
Modified:
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
Log:
sort icons in view
Modified:
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
===
--- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
2008-06-19 08:17:54 UTC (rev 27085)
+++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
2008-06-19 08:18:09 UTC (rev 27086)
@@ -146,6 +146,33 @@
+static gint
+xfce_settings_manager_dialog_sort_icons(GtkTreeModel *model,
+GtkTreeIter *a,
+GtkTreeIter *b,
+gpointer user_data)
+{
+gchar *namea = NULL, *nameb = NULL;
+gint ret;
+
+gtk_tree_model_get(model, a, COL_NAME, &namea, -1);
+gtk_tree_model_get(model, b, COL_NAME, &nameb, -1);
+
+if(!namea && !nameb)
+ret = 0;
+else if(!namea)
+ret = -1;
+else if(!nameb)
+ret = 1;
+else
+ret = g_utf8_collate(namea, nameb);
+
+g_free(namea);
+g_free(nameb);
+
+return ret;
+}
+
static void
xfce_settings_manager_dialog_create_liststore(XfceSettingsManagerDialog
*dialog)
{
@@ -241,6 +268,12 @@
}
g_strfreev(dirs);
+
+gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(dialog->ls), COL_NAME,
+xfce_settings_manager_dialog_sort_icons,
+dialog, NULL);
+gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(dialog->ls),
+ COL_NAME, GTK_SORT_ASCENDING);
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27085 - in xfce4-settings/trunk: . xfce4-settings-manager
Author: kelnos
Date: 2008-06-19 08:17:54 + (Thu, 19 Jun 2008)
New Revision: 27085
Modified:
xfce4-settings/trunk/configure.ac.in
xfce4-settings/trunk/xfce4-settings-manager/Makefile.am
xfce4-settings/trunk/xfce4-settings-manager/main.c
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
Log:
use ExoIconView instead (single-click activate) and pack it in a scrolled win
Modified: xfce4-settings/trunk/configure.ac.in
===
--- xfce4-settings/trunk/configure.ac.in2008-06-19 08:17:41 UTC (rev
27084)
+++ xfce4-settings/trunk/configure.ac.in2008-06-19 08:17:54 UTC (rev
27085)
@@ -58,6 +58,7 @@
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.0])
XDT_CHECK_OPTIONAL_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
XDT_CHECK_PACKAGE([LIBNOTIFY], [libnotify], [0.1.3])
Modified: xfce4-settings/trunk/xfce4-settings-manager/Makefile.am
===
--- xfce4-settings/trunk/xfce4-settings-manager/Makefile.am 2008-06-19
08:17:41 UTC (rev 27084)
+++ xfce4-settings/trunk/xfce4-settings-manager/Makefile.am 2008-06-19
08:17:54 UTC (rev 27085)
@@ -4,12 +4,14 @@
-DLOCALEDIR=\"$(localedir)\" \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS)
+ $(LIBXFCEGUI4_CFLAGS) \
+ $(EXO_CFLAGS)
LIBS = \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
- $(LIBXFCEGUI4_LIBS)
+ $(LIBXFCEGUI4_LIBS) \
+ $(EXO_LIBS)
xfce4_settings_manager_SOURCES = \
main.c \
Modified: xfce4-settings/trunk/xfce4-settings-manager/main.c
===
--- xfce4-settings/trunk/xfce4-settings-manager/main.c 2008-06-19 08:17:41 UTC
(rev 27084)
+++ xfce4-settings/trunk/xfce4-settings-manager/main.c 2008-06-19 08:17:54 UTC
(rev 27085)
@@ -22,7 +22,6 @@
#endif
#include
-
#include
#include "xfce-settings-manager-dialog.h"
Modified:
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
===
--- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
2008-06-19 08:17:41 UTC (rev 27084)
+++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
2008-06-19 08:17:54 UTC (rev 27085)
@@ -29,6 +29,7 @@
#include
#include
+#include
#include "xfce-settings-manager-dialog.h"
@@ -62,6 +63,14 @@
static void xfce_settings_manager_dialog_item_activated(GtkIconView *iconview,
GtkTreePath *path,
gpointer user_data);
+#if GTK_CHECK_VERSION(2, 12, 0)
+static gboolean xfce_settings_manager_dialog_query_tooltip(GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean
keyboard_tip,
+ GtkTooltip *tooltip,
+ gpointer data);
+#endif
static const char *categories[] = {
"Name", "GenericName", "X-XfceSettingsName", "Icon", "Comment", "Exec",
@@ -84,29 +93,43 @@
static void
xfce_settings_manager_dialog_init(XfceSettingsManagerDialog *dialog)
{
-GtkWidget *iconview;
+GtkWidget *sw, *iconview;
xfce_titled_dialog_set_subtitle(XFCE_TITLED_DIALOG(dialog),
_("Customize your Xfce desktop"));
gtk_window_set_title(GTK_WINDOW(dialog), _("Xfce Settings Manager"));
gtk_window_set_icon_name(GTK_WINDOW(dialog), "xfce4-settings");
-iconview = gtk_icon_view_new();
-gtk_icon_view_set_text_column(GTK_ICON_VIEW(iconview), COL_NAME);
-gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(iconview), COL_PIXBUF);
+sw = gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+gtk_widget_show(sw);
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), sw, TRUE, TRUE, 0);
+
+xfce_settings_manager_dialog_create_liststore(dialog);
+iconview = exo_icon_view_new_with_model(GTK_TREE_MODEL(dialog->ls));
+/* FIXME: use the cell layout stuff and not these deprecated functions.
+ * for now i'm just lazy cuz this is so much easier. */
+exo_icon_view_set_text_column(EXO_ICON_VIEW(iconview), COL_NAME);
+exo_icon_view_set_pixbuf_column(EXO_ICON_VIEW(iconview), COL_PIXBUF);
#if GTK_CHECK_VERSION(2, 12, 0)
-gtk_icon_view_set_tooltip_column(GTK_ICON_VIEW(iconview), CO
[Xfce4-commits] r27084 - xfce4-settings/trunk/xfce4-settings-manager
Author: kelnos
Date: 2008-06-19 08:17:41 + (Thu, 19 Jun 2008)
New Revision: 27084
Modified:
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
Log:
first try the X-XfceSettingsName key in the .desktop file for compactness
Modified:
xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
===
--- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
2008-06-19 07:31:03 UTC (rev 27083)
+++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
2008-06-19 08:17:41 UTC (rev 27084)
@@ -64,9 +64,10 @@
gpointer user_data);
static const char *categories[] = {
-"Name", "GenericName", "Icon", "Comment", "Exec", "TryExec",
"StartupNotify", "Hidden",
+"Name", "GenericName", "X-XfceSettingsName", "Icon", "Comment", "Exec",
+"TryExec", "StartupNotify", "Hidden",
};
-static const gint n_categories = 8;
+static const gint n_categories = 9;
G_DEFINE_TYPE(XfceSettingsManagerDialog, xfce_settings_manager_dialog,
XFCE_TYPE_TITLED_DIALOG)
@@ -183,8 +184,9 @@
g_free(tryexec);
}
-if(!xfce_desktop_entry_get_string(dentry, "GenericName", TRUE,
&name))
-xfce_desktop_entry_get_string(dentry, "Name", TRUE, &name);
+if(!xfce_desktop_entry_get_string(dentry, "X-XfceSettingsName",
TRUE, &name))
+if(!xfce_desktop_entry_get_string(dentry, "GenericName", TRUE,
&name))
+xfce_desktop_entry_get_string(dentry, "Name", TRUE, &name);
xfce_desktop_entry_get_string(dentry, "Icon", FALSE, &icon);
xfce_desktop_entry_get_string(dentry, "Comment", TRUE, &comment);
xfce_desktop_entry_get_string(dentry, "Exec", FALSE, &exec);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27083 - libexo/trunk
Author: stephan Date: 2008-06-19 07:31:03 + (Thu, 19 Jun 2008) New Revision: 27083 Modified: libexo/trunk/configure.in.in Log: Update the version-number in trunk Modified: libexo/trunk/configure.in.in === --- libexo/trunk/configure.in.in2008-06-19 07:30:34 UTC (rev 27082) +++ libexo/trunk/configure.in.in2008-06-19 07:31:03 UTC (rev 27083) @@ -12,7 +12,7 @@ m4_define([libexo_verinfo], [5:0:5]) m4_define([libexo_version_major], [0]) m4_define([libexo_version_minor], [3]) -m4_define([libexo_version_micro], [5]) +m4_define([libexo_version_micro], [7]) m4_define([libexo_version_nano], []) m4_define([libexo_version_build], [EMAIL PROTECTED]@]) m4_define([libexo_version_tag], [svn]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27082 - libexo/branches/xfce_4_4
Author: stephan Date: 2008-06-19 07:30:34 + (Thu, 19 Jun 2008) New Revision: 27082 Modified: libexo/branches/xfce_4_4/configure.in.in Log: Update version number in xfce_4_4 branch Modified: libexo/branches/xfce_4_4/configure.in.in === --- libexo/branches/xfce_4_4/configure.in.in2008-06-19 07:18:24 UTC (rev 27081) +++ libexo/branches/xfce_4_4/configure.in.in2008-06-19 07:30:34 UTC (rev 27082) @@ -12,7 +12,7 @@ m4_define([libexo_verinfo], [5:0:5]) m4_define([libexo_version_major], [0]) m4_define([libexo_version_minor], [3]) -m4_define([libexo_version_micro], [5]) +m4_define([libexo_version_micro], [6]) m4_define([libexo_version_nano], []) m4_define([libexo_version_build], [EMAIL PROTECTED]@]) m4_define([libexo_version_tag], [svn]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27081 - xfwm4/trunk/src
Author: olivier
Date: 2008-06-19 07:18:24 + (Thu, 19 Jun 2008)
New Revision: 27081
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/focus.c
xfwm4/trunk/src/settings.c
Log:
Make focused opacity more efficient (although much simpler, but I don't really
like this feture anyway)
Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2008-06-18 20:43:00 UTC (rev 27080)
+++ xfwm4/trunk/src/client.c2008-06-19 07:18:24 UTC (rev 27081)
@@ -3123,12 +3123,38 @@
}
void
-clientUpdateOpacity (ScreenInfo *screen_info, Client *focus)
+clientUpdateOpacity (Client *c)
{
+ScreenInfo *screen_info;
DisplayInfo *display_info;
+Client *focused;
+gboolean opaque;
+
+g_return_if_fail (c != NULL);
+
+screen_info = c->screen_info;
+display_info = screen_info->display_info;
+if (!compositorIsUsable (display_info))
+{
+return;
+}
+
+focused = clientGetFocus ();
+opaque = (FLAG_TEST(c->type, WINDOW_TYPE_DONT_PLACE |
WINDOW_TYPE_DONT_FOCUS)
+ || (focused == c));
+
+clientSetOpacity (c, c->opacity, OPACITY_INACTIVE, opaque ? 0 :
OPACITY_INACTIVE);
+}
+
+void
+clientUpdateAllOpacity (ScreenInfo *screen_info)
+{
+DisplayInfo *display_info;
Client *c;
int i;
+g_return_if_fail (screen_info != NULL);
+
display_info = screen_info->display_info;
if (!compositorIsUsable (display_info))
{
@@ -3137,12 +3163,7 @@
for (c = screen_info->clients, i = 0; i < screen_info->client_count; c =
c->next, ++i)
{
-gboolean o = FLAG_TEST(c->type, WINDOW_TYPE_DONT_PLACE |
WINDOW_TYPE_DONT_FOCUS)
- || (focus == c)
- || (focus && ((focus->transient_for == c->window) ||
(focus->window == c->transient_for)))
- || (focus && (clientIsModalFor (c, focus) ||
clientIsModalFor (focus, c)));
-
-clientSetOpacity (c, c->opacity, OPACITY_INACTIVE, o ? 0 :
OPACITY_INACTIVE);
+clientUpdateOpacity (c);
}
}
Modified: xfwm4/trunk/src/client.h
===
--- xfwm4/trunk/src/client.h2008-06-18 20:43:00 UTC (rev 27080)
+++ xfwm4/trunk/src/client.h2008-06-19 07:18:24 UTC (rev 27081)
@@ -392,8 +392,8 @@
gboolean);
void clientFill (Client *,
int);
-void clientUpdateOpacity(ScreenInfo *,
- Client *);
+void clientUpdateOpacity(Client *);
+void clientUpdateAllOpacity (ScreenInfo *);
void clientSetOpacity (Client *,
guint,
guint, guint);
Modified: xfwm4/trunk/src/focus.c
===
--- xfwm4/trunk/src/focus.c 2008-06-18 20:43:00 UTC (rev 27080)
+++ xfwm4/trunk/src/focus.c 2008-06-19 07:18:24 UTC (rev 27081)
@@ -533,6 +533,8 @@
}
clientAdjustFullscreenLayer (c, TRUE);
frameQueueDraw (c, FALSE);
+clientUpdateOpacity (c);
+
}
if (c2)
{
@@ -541,6 +543,7 @@
clientAdjustFullscreenLayer (c2, FALSE);
}
frameQueueDraw (c2, FALSE);
+clientUpdateOpacity (c2);
}
clientSetNetActiveWindow (screen_info, c, 0);
clientClearDelayedFocus ();
@@ -601,7 +604,6 @@
{
XSetInputFocus (myScreenGetXDisplay (screen_info), c->window,
RevertToPointerRoot, timestamp);
}
-clientUpdateOpacity (screen_info, c);
}
else
{
@@ -628,7 +630,6 @@
client_focus = NULL;
clientFocusNone (screen_info, c2, timestamp);
clientClearDelayedFocus ();
-clientUpdateOpacity (screen_info, c);
}
}
Modified: xfwm4/trunk/src/settings.c
===
--- xfwm4/trunk/src/settings.c 2008-06-18 20:43:00 UTC (rev 27080)
+++ xfwm4/trunk/src/settings.c 2008-06-19 07:18:24 UTC (rev 27081)
@@ -428,7 +428,7 @@
{
screen_info->params->inactive_opacity =
setting->data.v_int;
reloadScreenSettings (screen_info, UPDATE_FRAME);
-clientUpdateOpacity (screen_info, clientGetFocus ());
+clientUpdateAllOpacity (screen_info);
}
else if (!strcmp (name, "Xfwm/MoveOpacity"))
{
_
