Bug 1433863 - Use client titlebar decorations on GNOME Flashback (former fallback) DE, r=jhorak

Also comment existing entries at nsWindow::GetCSDSupportLevel().

MozReview-Commit-ID: 1YzZhv7WrQj

--HG--
extra : rebase_source : c1dd1a3452e13e2479afee3c34d396757dae4cfd
This commit is contained in:
Martin Stransky 2018-01-29 15:31:59 +01:00
parent 41a1a6c9b0
commit 299c2a6d50

View File

@ -6868,12 +6868,17 @@ nsWindow::GetCSDSupportLevel() {
const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
if (currentDesktop) {
if (strstr(currentDesktop, "GNOME") != nullptr) {
// GNOME Flashback (fallback)
if (strstr(currentDesktop, "GNOME-Flashback:GNOME") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FLAT;
// gnome-shell
} else if (strstr(currentDesktop, "GNOME") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FULL;
} else if (strstr(currentDesktop, "XFCE") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FLAT;
} else if (strstr(currentDesktop, "X-Cinnamon") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FULL;
// KDE Plasma
} else if (strstr(currentDesktop, "KDE") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FLAT;
} else if (strstr(currentDesktop, "LXDE") != nullptr) {
@ -6884,8 +6889,10 @@ nsWindow::GetCSDSupportLevel() {
sCSDSupportLevel = CSD_SUPPORT_NONE;
} else if (strstr(currentDesktop, "MATE") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FLAT;
// Ubuntu Unity
} else if (strstr(currentDesktop, "Unity") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FLAT;
// Elementary OS
} else if (strstr(currentDesktop, "Pantheon") != nullptr) {
sCSDSupportLevel = CSD_SUPPORT_FULL;
} else if (strstr(currentDesktop, "LXQt") != nullptr) {