Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1426384 - call gdk_window_set_decorations() on mShell GdkWindow only, r=jhorak

Browse Source 
To have any effect we need to call gdk_window_set_decorations() on top-level GdkWindow only.
When rendering to mContainer the mGdkWindow belongs to mContainer so we need to get the window
from mShell explicitly.

MozReview-Commit-ID: KLKlVJbgg3

--HG--
extra : rebase_source : c17310949e067dca540bf269f12db135e6582ebc
This commit is contained in:
Martin Stransky 2017-12-20 16:31:13 +01:00
parent b07ea64a0d
commit 3f9d6ff25b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
widget/gtk/nsWindow.cpp
View File

@ -5102,21 +5102,25 @@ nsWindow::SetWindowDecoration(nsBorderStyle aStyle)
return;
}
// We can't use mGdkWindow directly here as it can be
// derived from mContainer which is not a top-level GdkWindow.
GdkWindow *window = gtk_widget_get_window(mShell);
// Sawfish, metacity, and presumably other window managers get
// confused if we change the window decorations while the window
// is visible.
bool wasVisible = false;
if (gdk_window_is_visible(mGdkWindow)) {
gdk_window_hide(mGdkWindow);
if (gdk_window_is_visible(window)) {
gdk_window_hide(window);
wasVisible = true;
}
gint wmd = ConvertBorderStyles(aStyle);
if (wmd != -1)
gdk_window_set_decorations(mGdkWindow, (GdkWMDecoration) wmd);
gdk_window_set_decorations(window, (GdkWMDecoration) wmd);
if (wasVisible)
gdk_window_show(mGdkWindow);
gdk_window_show(window);
// For some window managers, adding or removing window decorations
// requires unmapping and remapping our toplevel window. Go ahead
@ -5124,10 +5128,13 @@ nsWindow::SetWindowDecoration(nsBorderStyle aStyle)
// error later when this happens (when the persistence timer fires
// and GetWindowPos is called)
#ifdef MOZ_X11
XSync(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) , False);
#else
gdk_flush ();
if (mIsX11Display) {
XSync(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()) , False);
} else
#endif /* MOZ_X11 */
{
gdk_flush ();
}
}
void