summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-04-30 13:10:21 +0200
committerMartin Stransky <stransky@redhat.com>2018-04-30 13:10:21 +0200
commit9088fae3a2e990703677b4f498fc6eb23020b55b (patch)
treefbbf0f3650d62e85102bb3041cb2e6958a3727cb
parentMerge branch 'master' into f26 (diff)
parentBuild fix (diff)
downloadlibrewolf-fedora-ff-9088fae3a2e990703677b4f498fc6eb23020b55b.tar.gz
librewolf-fedora-ff-9088fae3a2e990703677b4f498fc6eb23020b55b.tar.bz2
librewolf-fedora-ff-9088fae3a2e990703677b4f498fc6eb23020b55b.zip
Merge branch 'master' into f26
-rw-r--r--complete-csd-window-offset-mozilla-1457691.patch37
1 files changed, 35 insertions, 2 deletions
diff --git a/complete-csd-window-offset-mozilla-1457691.patch b/complete-csd-window-offset-mozilla-1457691.patch
index 85cb981..e37d02d 100644
--- a/complete-csd-window-offset-mozilla-1457691.patch
+++ b/complete-csd-window-offset-mozilla-1457691.patch
@@ -1,5 +1,12 @@
-diff -up firefox-60.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-60.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
-diff -up firefox-60.0/media/webrtc/trunk/Makefile.old firefox-60.0/media/webrtc/trunk/Makefile
+This is a composition of these patches for Firefox 60:
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1441665
+https://bugzilla.mozilla.org/show_bug.cgi?id=1456898
+https://bugzilla.mozilla.org/show_bug.cgi?id=1457309
+https://bugzilla.mozilla.org/show_bug.cgi?id=1457691
+
+which fix popup window placement at CSD window mode.
+
diff -up firefox-60.0/widget/gtk/gtk3drawing.cpp.old firefox-60.0/widget/gtk/gtk3drawing.cpp
--- firefox-60.0/widget/gtk/gtk3drawing.cpp.old 2018-04-26 22:07:36.000000000 +0200
+++ firefox-60.0/widget/gtk/gtk3drawing.cpp 2018-04-30 11:59:06.750866104 +0200
@@ -210,3 +217,29 @@ diff -up firefox-60.0/widget/gtk/nsWindow.h.old firefox-60.0/widget/gtk/nsWindow
GtkWidget *mShell;
MozContainer *mContainer;
GdkWindow *mGdkWindow;
+diff -up firefox-60.0/widget/gtk/WidgetStyleCache.cpp.old firefox-60.0/widget/gtk/WidgetStyleCache.cpp
+--- firefox-60.0/widget/gtk/WidgetStyleCache.cpp.old 2018-04-26 22:07:35.000000000 +0200
++++ firefox-60.0/widget/gtk/WidgetStyleCache.cpp 2018-04-30 13:07:04.170056312 +0200
+@@ -1285,6 +1285,22 @@ GetCssNodeStyleInternal(WidgetNodeType a
+ "MOZ_GTK_HEADER_BAR_BUTTON_RESTORE is used as an icon only!");
+ return nullptr;
+ }
++ case MOZ_GTK_WINDOW_DECORATION:
++ {
++ GtkStyleContext* parentStyle =
++ CreateSubStyleWithClass(MOZ_GTK_WINDOW, "csd");
++ style = CreateCSSNode("decoration", parentStyle);
++ g_object_unref(parentStyle);
++ break;
++ }
++ case MOZ_GTK_WINDOW_DECORATION_SOLID:
++ {
++ GtkStyleContext* parentStyle =
++ CreateSubStyleWithClass(MOZ_GTK_WINDOW, "solid-csd");
++ style = CreateCSSNode("decoration", parentStyle);
++ g_object_unref(parentStyle);
++ break;
++ }
+ default:
+ return GetWidgetRootStyle(aNodeType);
+ }
bgstack15