Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support disabling window decorations in X11 and Win32 #196

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Support disabling window decorations in X11 and Win32 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dgl/Window.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ class Window
bool isResizable() const noexcept;
void setResizable(bool yesNo);

bool isDecorated() const noexcept;
void setDecorated(bool yesNo);

uint getWidth() const noexcept;
uint getHeight() const noexcept;
Size<uint> getSize() const noexcept;
Expand Down
61 changes: 60 additions & 1 deletion dgl/src/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ struct Window::PrivateData {
fFirstInit(true),
fVisible(false),
fResizable(true),
fDecorated(true),
fUsingEmbed(false),
fWidth(1),
fHeight(1),
Expand Down Expand Up @@ -134,6 +135,7 @@ struct Window::PrivateData {
fFirstInit(true),
fVisible(false),
fResizable(true),
fDecorated(true),
fUsingEmbed(false),
fWidth(1),
fHeight(1),
Expand Down Expand Up @@ -188,6 +190,7 @@ struct Window::PrivateData {
fFirstInit(true),
fVisible(parentId != 0),
fResizable(resizable),
fDecorated(true),
fUsingEmbed(parentId != 0),
fWidth(1),
fHeight(1),
Expand Down Expand Up @@ -659,6 +662,43 @@ struct Window::PrivateData {

// -------------------------------------------------------------------

void setDecorated(const bool yesNo)
{
if (fDecorated == yesNo)
{
DBG("Window setDecorated matches current state, ignoring request\n");
return;
}

fDecorated = yesNo;

#if defined(DISTRHO_OS_HAIKU)
// TODO
#elif defined(DISTRHO_OS_MAC)
// TODO
#elif defined(DISTRHO_OS_WINDOWS)
const int winFlags = fDecorated ? GetWindowLong(hwnd, GWL_STYLE) | WS_CAPTION
: GetWindowLong(hwnd, GWL_STYLE) & ~WS_CAPTION;

RECT rect = {0, 0, 0, 0};
GetWindowRect(hwnd, &rect);
rect.right = rect.left + fWidth;
rect.bottom = rect.top + fHeight;
AdjustWindowRectEx(&rect, fUsingEmbed ? WS_CHILD : winFlags, FALSE, WS_EX_TOPMOST);

SetWindowLong(hwnd, GWL_STYLE, winFlags);
MoveWindow(hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, TRUE);
#else
Atom motifWmHints = XInternAtom(xDisplay, "_MOTIF_WM_HINTS", True);
long hints[5] = {2, 0, fDecorated ? 1 : 0, 0, 0}; // see MotifWmHints in LessTif MwmUtil.h
XChangeProperty(xDisplay, xWindow,
motifWmHints, motifWmHints, 32, PropModeReplace,
(unsigned char*)&hints, 5);
#endif
}

// -------------------------------------------------------------------

void setGeometryConstraints(uint width, uint height, bool aspect)
{
// Did you forget to set DISTRHO_UI_USER_RESIZABLE ?
Expand Down Expand Up @@ -726,7 +766,7 @@ struct Window::PrivateData {
}
}
#elif defined(DISTRHO_OS_WINDOWS)
const int winFlags = WS_POPUPWINDOW | WS_CAPTION | (fResizable ? WS_SIZEBOX : 0x0);
const int winFlags = WS_POPUPWINDOW | (fDecorated ? WS_CAPTION : 0x00) | (fResizable ? WS_SIZEBOX : 0x0);
RECT wr = { 0, 0, static_cast<LONG>(width), static_cast<LONG>(height) };
AdjustWindowRectEx(&wr, fUsingEmbed ? WS_CHILD : winFlags, FALSE, WS_EX_TOPMOST);

Expand All @@ -753,6 +793,14 @@ struct Window::PrivateData {
XSetWMNormalHints(xDisplay, xWindow, &sizeHints);
}

{
Atom motifWmHints = XInternAtom(xDisplay, "_MOTIF_WM_HINTS", True);
long hints[5] = {2, 0, fDecorated ? 1 : 0, 0, 0};
XChangeProperty(xDisplay, xWindow,
motifWmHints, motifWmHints, 32, PropModeReplace,
(unsigned char*)&hints, 5);
}

XResizeWindow(xDisplay, xWindow, width, height);

if (! forced)
Expand Down Expand Up @@ -1229,6 +1277,7 @@ struct Window::PrivateData {
bool fFirstInit;
bool fVisible;
bool fResizable;
bool fDecorated;
bool fUsingEmbed;
uint fWidth;
uint fHeight;
Expand Down Expand Up @@ -1615,6 +1664,16 @@ void Window::setResizable(bool yesNo)
pData->setResizable(yesNo);
}

bool Window::isDecorated() const noexcept
{
return pData->fDecorated;
}

void Window::setDecorated(bool yesNo)
{
pData->setDecorated(yesNo);
}

void Window::setGeometryConstraints(uint width, uint height, bool aspect)
{
pData->setGeometryConstraints(width, height, aspect);
Expand Down