Bug 1497534 - Check Gtk backdrop state flag to make Firefox toplevel …

…window look inactive, r=jhorak Differential Revision: https://phabricator.services.mozilla.com/D10558
mozilla-spidermonkey · Nov 2, 2018 · 972d618 · 972d618
1 parent c656b8b
commit 972d618
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
@@ -7480,5 +7480,10 @@ nsWindow::GetTopLevelWindowActiveState(nsIFrame *aFrame)
       }
   }
 
-  return (gFocusWindow == window);
+  GtkWidget* widget = window->GetGtkWidget();
+  if (widget) {
+      return !(gtk_widget_get_state_flags(widget) & GTK_STATE_FLAG_BACKDROP);
+  }
+
+  return false;
 }
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
@@ -287,6 +287,7 @@ class nsWindow final : public nsBaseWidget
     // descendant windows
     GtkWidget*         GetMozContainerWidget();
     GdkWindow*         GetGdkWindow() { return mGdkWindow; }
+    GtkWidget*         GetGtkWidget() { return mShell; }
     bool               IsDestroyed() { return mIsDestroyed; }
 
     void               DispatchDragEvent(mozilla::EventMessage aMsg,