summaryrefslogtreecommitdiff
path: root/D53965-dropdown-missing-on-multimonitor.diff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2019-11-26 11:08:42 +0100
committerMartin Stransky <stransky@redhat.com>2019-11-26 11:08:42 +0100
commit6543968420713fbda210ac0058e9b118b3ab0b48 (patch)
treec0ea961790d87321e590438be96675757d087e7b /D53965-dropdown-missing-on-multimonitor.diff
parentMerge branch 'master' into f31 (diff)
parentUpdated to 71.0 Build 2 (diff)
downloadlibrewolf-fedora-ff-6543968420713fbda210ac0058e9b118b3ab0b48.tar.gz
librewolf-fedora-ff-6543968420713fbda210ac0058e9b118b3ab0b48.tar.bz2
librewolf-fedora-ff-6543968420713fbda210ac0058e9b118b3ab0b48.zip
Merge branch 'master' into f31
Diffstat (limited to 'D53965-dropdown-missing-on-multimonitor.diff')
-rw-r--r--D53965-dropdown-missing-on-multimonitor.diff97
1 files changed, 97 insertions, 0 deletions
diff --git a/D53965-dropdown-missing-on-multimonitor.diff b/D53965-dropdown-missing-on-multimonitor.diff
new file mode 100644
index 0000000..d974e74
--- /dev/null
+++ b/D53965-dropdown-missing-on-multimonitor.diff
@@ -0,0 +1,97 @@
+diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
+--- a/widget/gtk/nsWindow.cpp
++++ b/widget/gtk/nsWindow.cpp
+@@ -1295,13 +1295,12 @@
+ GdkWindow* window, const GdkRectangle* flipped_rect,
+ const GdkRectangle* final_rect, gboolean flipped_x, gboolean flipped_y,
+ void* aWindow) {
+- LOG(("%s [%p] flipped_x %d flipped_y %d\n", __FUNCTION__, aWindow, flipped_x,
+- flipped_y));
+-
+- LOG(("%s [%p] flipped %d %d w:%d h:%d\n", __FUNCTION__, aWindow,
+- flipped_rect->x, flipped_rect->y, flipped_rect->width,
+- flipped_rect->height));
+- LOG(("%s [%p] final %d %d w:%d h:%d\n", __FUNCTION__, aWindow, final_rect->x,
++ LOG(("NativeMoveResizeWaylandPopupCallback [%p] flipped_x %d flipped_y %d\n",
++ aWindow, flipped_x, flipped_y));
++
++ LOG((" flipped_rect x: %d y: %d width: %d height: %d\n", flipped_rect->x,
++ flipped_rect->y, flipped_rect->width, flipped_rect->height));
++ LOG((" final_rect x: %d y: %d width: %d height: %d\n", final_rect->x,
+ final_rect->y, final_rect->width, final_rect->height));
+ }
+ #endif
+@@ -1312,12 +1311,13 @@
+ static auto sGdkWindowMoveToRect = (void (*)(
+ GdkWindow*, const GdkRectangle*, GdkGravity, GdkGravity, GdkAnchorHints,
+ gint, gint))dlsym(RTLD_DEFAULT, "gdk_window_move_to_rect");
++ LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p]\n", (void*)this));
+
+ // Compositor may be confused by windows with width/height = 0
+ // and positioning such windows leads to Bug 1555866.
+ if (!AreBoundsSane()) {
+- LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] Bounds are not sane\n",
+- (void*)this));
++ LOG((" Bounds are not sane (width: %d height: %d)\n", mBounds.width,
++ mBounds.height));
+ return;
+ }
+
+@@ -1331,15 +1331,14 @@
+ // - gdk_window_move_to_rect() is not available
+ // - the widget doesn't have a valid GdkWindow
+ if (!sGdkWindowMoveToRect || !gdkWindow) {
+- LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] use gtk_window_move()\n",
+- (void*)this));
++ LOG((" use gtk_window_move(%d, %d)\n", aPosition->x, aPosition->y));
+ gtk_window_move(GTK_WINDOW(mShell), aPosition->x, aPosition->y);
+ return;
+ }
+
+ GtkWidget* parentWindow = ConfigureWaylandPopupWindows();
+- LOG(("nsWindow::NativeMoveResizeWaylandPopup [%p] Set popup parent %p\n",
+- (void*)this, parentWindow));
++ LOG(("nsWindow::NativeMoveResizeWaylandPopup: Set popup parent %p\n",
++ parentWindow));
+
+ int x_parent, y_parent;
+ gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(parentWindow)),
+@@ -1351,12 +1350,6 @@
+ rect.height = aSize->height;
+ }
+
+- LOG(("%s [%p] request position %d,%d\n", __FUNCTION__, (void*)this,
+- aPosition->x, aPosition->y));
+- if (aSize) {
+- LOG((" request size %d,%d\n", aSize->width, aSize->height));
+- }
+- LOG((" request result %d %d\n", rect.x, rect.y));
+ #ifdef DEBUG
+ if (!g_signal_handler_find(
+ gdkWindow, G_SIGNAL_MATCH_FUNC, 0, 0, nullptr,
+@@ -1389,10 +1382,8 @@
+ HideWaylandWindow();
+ }
+
+- LOG(
+- ("nsWindow::NativeMoveResizeWaylandPopup [%p]: requested rect: x%d y%d "
+- "w%d h%d\n",
+- this, rect.x, rect.y, rect.width, rect.height));
++ LOG((" requested rect: x: %d y: %d width: %d height: %d\n", rect.x, rect.y,
++ rect.width, rect.height));
+ if (aSize) {
+ LOG((" aSize: x%d y%d w%d h%d\n", aSize->x, aSize->y, aSize->width,
+ aSize->height));
+@@ -7348,8 +7339,9 @@
+ if (monitor) {
+ GdkRectangle workArea;
+ s_gdk_monitor_get_workarea(monitor, &workArea);
+- aRect->x = workArea.x;
+- aRect->y = workArea.y;
++ // The monitor offset won't help us in Wayland, because we can't get the
++ // absolute position of our window.
++ aRect->x = aRect->y = 0;
+ aRect->width = workArea.width;
+ aRect->height = workArea.height;
+ LOG((" workarea for [%p], monitor %p: x%d y%d w%d h%d\n", this, monitor,
+
bgstack15