Commit fee38504 authored by ma1's avatar ma1 Committed by Richard Pospesel
Browse files

fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.

Bug 42500: Fix restored window size after startup maximization
parent 308ea305
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -1581,6 +1581,13 @@ BrowserGlue.prototype = {
      return;
    }

    // We don't want to mess up with RFP new window / letterboxing machinery.
    if (
      Services.prefs.getBoolPref("privacy.resistFingerprinting", false)
    ) {
      return;
    }

    let store = Services.xulStore;
    let getValue = attr =>
      store.getValue(AppConstants.BROWSER_CHROME_URL, "main-window", attr);
+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ static const char kPrefThemeId[] = "extensions.activeThemeID";
static const char kPrefBrowserStartupBlankWindow[] =
    "browser.startup.blankWindow";
static const char kPrefPreXulSkeletonUI[] = "browser.startup.preXulSkeletonUI";
static const char kPrefResistFingerprinting[] = "privacy.resistFingerprinting";
#endif  // defined(XP_WIN)

#if defined(MOZ_WIDGET_GTK)
@@ -2260,6 +2261,7 @@ static void ReflectSkeletonUIPrefToRegistry(const char* aPref, void* aData) {
  bool shouldBeEnabled =
      Preferences::GetBool(kPrefPreXulSkeletonUI, false) &&
      Preferences::GetBool(kPrefBrowserStartupBlankWindow, false) &&
      !Preferences::GetBool(kPrefResistFingerprinting, false) &&
      LookAndFeel::DrawInTitlebar();
  if (shouldBeEnabled && Preferences::HasUserValue(kPrefThemeId)) {
    nsCString themeId;