From add7e936ddfc4e30f9b1990501eb7bde10f04e37 Mon Sep 17 00:00:00 2001 From: Simon Steinbeiss Date: Mon, 3 Feb 2020 14:42:59 +0100 Subject: [PATCH] panel: Don't tamper with leave_opacity value (Bug #16296) Instead of changing the value of leave_opacity and remembering the original value when compositing changes, we just set the value hardcoded to 1.0 to avoid artifacts. --- panel/panel-base-window.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c index c508bf81..f62f6c9a 100644 --- a/panel/panel-base-window.c +++ b/panel/panel-base-window.c @@ -523,8 +523,6 @@ panel_base_window_composited_changed (GdkScreen *screen, if (window->is_composited) { - if (window->leave_opacity != window->leave_opacity_old) - window->leave_opacity = window->leave_opacity_old; gtk_widget_set_opacity (GTK_WIDGET (widget), window->leave_opacity); panel_base_window_set_plugin_data (window, panel_base_window_set_plugin_leave_opacity); @@ -532,11 +530,8 @@ panel_base_window_composited_changed (GdkScreen *screen, } else { - /* make sure that the leave opacity is always disabled without compositing, but - remember the original value so we can reset it if compositing gets re-enabled */ - window->leave_opacity_old = window->leave_opacity; - window->leave_opacity = 1.0; - gtk_widget_set_opacity (GTK_WIDGET (widget), window->leave_opacity); + /* make sure to always disable the leave opacity without compositing */ + gtk_widget_set_opacity (GTK_WIDGET (widget), 1.0); panel_base_window_set_plugin_data (window, panel_base_window_set_plugin_leave_opacity); } @@ -755,7 +750,10 @@ panel_base_window_set_plugin_leave_opacity (GtkWidget *widget, { PanelBaseWindow *window = PANEL_BASE_WINDOW (user_data); - panel_base_window_set_plugin_opacity (widget, user_data, window->leave_opacity); + if (window->is_composited) + panel_base_window_set_plugin_opacity (widget, user_data, window->leave_opacity); + else + panel_base_window_set_plugin_opacity (widget, user_data, 1.0); } -- 2.20.1