d402fcd892
Unhide our buttons instead, which fixes the caption button sizes when Mica is enabled. Crucially (and this is what I had failed to do in my original attempts), we need to keep WS_MAXIMIZEBOX for Snap Layouts and Aero snap to keep working. WS_MINIMIZEBOX doesn't hurt either. This is a bit scary, because we're in undocumented territory, but afaict (looking with winspy), MS Edge does the same for its custom titlebar, so I think this is probably safe. It's early in the cycle anyways... Make the pre-xul skeleton UI flags more consistent while at it. WS_OVERLAPPED is zero, and WS_SIZEBOX is the same as WS_THICKFRAME (so there's no change other than removing WS_SYSMENU), but that way it matches nsWindow::WindowStyle more directly. In order to not fully lose the system menu functionality, reuse the functionality we already have to show it on fullscreen windows (which already lack these styles). Note that this also fixes a bug on which, if you have a fullscreen window in a non-primary monitor, the system menu shows up in the primary monitor instead of in your window. Differential Revision: https://phabricator.services.mozilla.com/D230722
130 lines
3.4 KiB
C++
130 lines
3.4 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef PreXULSkeletonUI_h_
|
|
#define PreXULSkeletonUI_h_
|
|
|
|
#include <windows.h>
|
|
#include "mozilla/EnumSet.h"
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/Result.h"
|
|
#include "mozilla/Types.h"
|
|
#include "mozilla/Vector.h"
|
|
|
|
namespace mozilla {
|
|
|
|
// These unfortunately need to be kept in sync with the window style and
|
|
// extended window style computations in nsWindow. Luckily those styles seem
|
|
// to not vary based off of any user settings for the initial toplevel window,
|
|
// so we're safe here for now.
|
|
static const DWORD kPreXULSkeletonUIWindowStyle =
|
|
WS_OVERLAPPED | WS_CLIPCHILDREN | WS_DLGFRAME | WS_BORDER | WS_THICKFRAME |
|
|
WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SYSMENU;
|
|
static const DWORD kPreXULSkeletonUIWindowStyleEx = WS_EX_WINDOWEDGE;
|
|
|
|
struct CSSPixelSpan {
|
|
double start;
|
|
double end;
|
|
};
|
|
|
|
struct DevPixelSpan {
|
|
int start;
|
|
int end;
|
|
};
|
|
|
|
enum class SkeletonUIDensity { Default, Touch, Compact };
|
|
|
|
struct SkeletonUISettings {
|
|
uint32_t screenX;
|
|
uint32_t screenY;
|
|
uint32_t width;
|
|
uint32_t height;
|
|
CSSPixelSpan urlbarSpan;
|
|
CSSPixelSpan searchbarSpan;
|
|
double cssToDevPixelScaling;
|
|
Vector<CSSPixelSpan> springs;
|
|
bool maximized;
|
|
bool menubarShown;
|
|
bool bookmarksToolbarShown;
|
|
bool rtlEnabled;
|
|
bool verticalTabs;
|
|
SkeletonUIDensity uiDensity;
|
|
};
|
|
|
|
enum class ThemeMode : uint32_t { Invalid, Default, Dark, Light };
|
|
|
|
enum class SkeletonUIFlag : uint8_t {
|
|
MenubarShown,
|
|
BookmarksToolbarShown,
|
|
RtlEnabled,
|
|
TouchDensity,
|
|
CompactDensity,
|
|
VerticalTabs
|
|
};
|
|
|
|
struct ThemeColors {
|
|
uint32_t backgroundColor;
|
|
uint32_t toolbarForegroundColor;
|
|
uint32_t titlebarColor;
|
|
uint32_t tabColor;
|
|
uint32_t tabOutlineColor;
|
|
uint32_t chromeContentDividerColor;
|
|
uint32_t urlbarColor;
|
|
uint32_t urlbarBorderColor;
|
|
uint32_t animationColor;
|
|
};
|
|
|
|
enum class PreXULSkeletonUIError : uint32_t {
|
|
None,
|
|
Disabled,
|
|
EnabledKeyDoesNotExist,
|
|
OOM,
|
|
Cmdline,
|
|
EnvVars,
|
|
FailedToOpenRegistryKey,
|
|
RegistryError,
|
|
FailedLoadingDynamicProcs,
|
|
FailedGettingLock,
|
|
FilesystemFailure,
|
|
NoStartWithLastProfile,
|
|
FailedRegisteringWindowClass,
|
|
CorruptData,
|
|
BadWindowDimensions,
|
|
FailedGettingMonitorInfo,
|
|
CreateWindowFailed,
|
|
FailedGettingDC,
|
|
FailedBlitting,
|
|
FailedFillingBottomRect,
|
|
CrashedOnce,
|
|
BadUIDensity,
|
|
Unknown,
|
|
};
|
|
|
|
enum class PreXULSkeletonUIProgress : uint32_t {
|
|
Started,
|
|
Completed,
|
|
};
|
|
|
|
MFBT_API void CreateAndStorePreXULSkeletonUI(HINSTANCE hInstance, int argc,
|
|
char** argv);
|
|
MFBT_API void CleanupProcessRuntime();
|
|
MFBT_API bool GetPreXULSkeletonUIWasShown();
|
|
MFBT_API HWND ConsumePreXULSkeletonUIHandle();
|
|
MFBT_API bool WasPreXULSkeletonUIMaximized();
|
|
MFBT_API Result<Ok, PreXULSkeletonUIError> PersistPreXULSkeletonUIValues(
|
|
const SkeletonUISettings& settings);
|
|
MFBT_API bool GetPreXULSkeletonUIEnabled();
|
|
MFBT_API Result<Ok, PreXULSkeletonUIError> SetPreXULSkeletonUIEnabledIfAllowed(
|
|
bool value);
|
|
MFBT_API void PollPreXULSkeletonUIEvents();
|
|
MFBT_API Result<Ok, PreXULSkeletonUIError> SetPreXULSkeletonUIThemeId(
|
|
ThemeMode theme);
|
|
MFBT_API Result<Ok, PreXULSkeletonUIError> NotePreXULSkeletonUIRestarting();
|
|
|
|
} // namespace mozilla
|
|
|
|
#endif
|