RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 00:57:36 +00:00
Code Issues Activity Actions

WindowServer: Don't add maximize button to non-resizable windows.

Browse source 
The minimize button can stay though, since it doesn't change the window
size, just the visibility. :^)
This commit is contained in:
Andreas Kling 2019-05-13 00:48:54 +02:00
parent 8c4b7fe385
commit 42cf09fdf1
4 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Servers/WindowServer/WSClientConnection.cpp
View file

@ -474,10 +474,9 @@ void WSClientConnection::handle_request(const WSAPIGetClipboardContentsRequest&)
void WSClientConnection::handle_request(const WSAPICreateWindowRequest& request) void WSClientConnection::handle_request(const WSAPICreateWindowRequest& request)
{ {
int window_id = m_next_window_id++; int window_id = m_next_window_id++;
auto window = make<WSWindow>(*this, request.window_type(), window_id, request.is_modal()); auto window = make<WSWindow>(*this, request.window_type(), window_id, request.is_modal(), request.is_resizable());
window->set_background_color(request.background_color()); window->set_background_color(request.background_color());
window->set_has_alpha_channel(request.has_alpha_channel()); window->set_has_alpha_channel(request.has_alpha_channel());
window->set_resizable(request.is_resizable());
window->set_title(request.title()); window->set_title(request.title());
window->set_rect(request.rect()); window->set_rect(request.rect());
window->set_opacity(request.opacity()); window->set_opacity(request.opacity());

10
Servers/WindowServer/WSWindow.cpp
View file

@ -28,10 +28,11 @@ WSWindow::WSWindow(CObject& internal_owner, WSWindowType type)
WSWindowManager::the().add_window(*this); WSWindowManager::the().add_window(*this);
} }
WSWindow::WSWindow(WSClientConnection& client, WSWindowType window_type, int window_id, bool modal) WSWindow::WSWindow(WSClientConnection& client, WSWindowType window_type, int window_id, bool modal, bool resizable)
: m_client(&client) : m_client(&client)
, m_type(window_type) , m_type(window_type)
, m_modal(modal) , m_modal(modal)
, m_resizable(resizable)
, m_window_id(window_id) , m_window_id(window_id)
, m_icon(default_window_icon()) , m_icon(default_window_icon())
, m_icon_path(default_window_icon_path()) , m_icon_path(default_window_icon_path())
@ -261,13 +262,6 @@ void WSWindow::set_visible(bool b)
invalidate(); invalidate();
} }
void WSWindow::set_resizable(bool resizable)
{
if (m_resizable == resizable)
return;
m_resizable = resizable;
}
void WSWindow::invalidate() void WSWindow::invalidate()
{ {
WSWindowManager::the().invalidate(*this); WSWindowManager::the().invalidate(*this);

3
Servers/WindowServer/WSWindow.h
View file

@ -16,7 +16,7 @@ class WSMouseEvent;
class WSWindow final : public CObject, public InlineLinkedListNode<WSWindow> { class WSWindow final : public CObject, public InlineLinkedListNode<WSWindow> {
public: public:
WSWindow(WSClientConnection&, WSWindowType, int window_id, bool modal); WSWindow(WSClientConnection&, WSWindowType, int window_id, bool modal, bool resizable);
WSWindow(CObject&, WSWindowType); WSWindow(CObject&, WSWindowType);
virtual ~WSWindow() override; virtual ~WSWindow() override;
@ -64,7 +64,6 @@ public:
bool is_modal() const { return m_modal; } bool is_modal() const { return m_modal; }
bool is_resizable() const { return m_resizable; } bool is_resizable() const { return m_resizable; }
void set_resizable(bool);
Rect rect() const { return m_rect; } Rect rect() const { return m_rect; }
void set_rect(const Rect&); void set_rect(const Rect&);

10
Servers/WindowServer/WSWindowFrame.cpp
View file

@ -94,10 +94,12 @@ WSWindowFrame::WSWindowFrame(WSWindow& window)
m_window.event(close_request); m_window.event(close_request);
})); }));
m_buttons.append(make<WSButton>(*this, *s_maximize_button_bitmap, [this] (auto& button) { if (window.is_resizable()) {
m_window.set_maximized(!m_window.is_maximized()); m_buttons.append(make<WSButton>(*this, *s_maximize_button_bitmap, [this] (auto& button) {
button.set_bitmap(m_window.is_maximized() ? *s_unmaximize_button_bitmap : *s_maximize_button_bitmap); m_window.set_maximized(!m_window.is_maximized());
})); button.set_bitmap(m_window.is_maximized() ? *s_unmaximize_button_bitmap : *s_maximize_button_bitmap);
}));
}
m_buttons.append(make<WSButton>(*this, *s_minimize_button_bitmap, [this] (auto&) { m_buttons.append(make<WSButton>(*this, *s_minimize_button_bitmap, [this] (auto&) {
m_window.set_minimized(true); m_window.set_minimized(true);