Bug 1423869 - force CSD_SUPPORT_NONE when XDG_CURRENT_DESKTOP is not set, r?jhorak draft
authorMartin Stransky <stransky@redhat.com>
Mon, 11 Dec 2017 11:05:27 +0100
changeset 710637 d6032db413a10d8ce0d505d723d2879896b1cbd1
parent 708706 4b94da21a9e6171f9911ffad171af23c26e6227b
child 710638 71d3d83c61cac2bc4cc84935418c98155598e868
push id92867
push userstransky@redhat.com
push dateMon, 11 Dec 2017 10:08:51 +0000
reviewersjhorak
bugs1423869
milestone59.0a1
Bug 1423869 - force CSD_SUPPORT_NONE when XDG_CURRENT_DESKTOP is not set, r?jhorak MozReview-Commit-ID: A4dz6ywrCsf
widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -7023,17 +7023,20 @@ nsWindow::GetCSDSupportLevel() {
             sCSDSupportLevel = CSD_SUPPORT_FLAT;
         } else if (strstr(currentDesktop, "i3") != nullptr) {
             sCSDSupportLevel = CSD_SUPPORT_NONE;
         } else if (strstr(currentDesktop, "MATE") != nullptr) {
             sCSDSupportLevel = CSD_SUPPORT_FLAT;
         } else {
             sCSDSupportLevel = CSD_SUPPORT_NONE;
         }
-    }
+    } else {
+        sCSDSupportLevel = CSD_SUPPORT_NONE;
+    }
+
     return sCSDSupportLevel;
 }
 
 int32_t
 nsWindow::RoundsWidgetCoordinatesTo()
 {
     return GdkScaleFactor();
 }