From 16cd4585cd4903466a9f5a3a474e66abd907e7a6 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 21 Feb 2019 10:11:12 +0100 Subject: [PATCH] WindowServer: Oops, forgot to plumb through the base size for incresize. --- Applications/Terminal/Terminal.cpp | 2 +- WindowServer/WSClientConnection.cpp | 1 + WindowServer/WSMessage.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Applications/Terminal/Terminal.cpp b/Applications/Terminal/Terminal.cpp index 76b753af35..4b63cd2d91 100644 --- a/Applications/Terminal/Terminal.cpp +++ b/Applications/Terminal/Terminal.cpp @@ -798,5 +798,5 @@ void Terminal::resize_event(GResizeEvent& event) void Terminal::apply_size_increments_to_window(GWindow& window) { window.set_size_increment({ font().glyph_width(), m_line_height }); - window.set_base_size({ m_inset, m_inset }); + window.set_base_size({ m_inset * 2, m_inset * 2}); } diff --git a/WindowServer/WSClientConnection.cpp b/WindowServer/WSClientConnection.cpp index b3c1271424..da59971995 100644 --- a/WindowServer/WSClientConnection.cpp +++ b/WindowServer/WSClientConnection.cpp @@ -320,6 +320,7 @@ void WSClientConnection::handle_request(WSAPICreateWindowRequest& request) window->set_rect(request.rect()); window->set_opacity(request.opacity()); window->set_size_increment(request.size_increment()); + window->set_base_size(request.base_size()); m_windows.set(window_id, move(window)); WSAPI_ServerMessage response; response.type = WSAPI_ServerMessage::Type::DidCreateWindow; diff --git a/WindowServer/WSMessage.h b/WindowServer/WSMessage.h index cf7a8bc319..8cd7a6a627 100644 --- a/WindowServer/WSMessage.h +++ b/WindowServer/WSMessage.h @@ -355,8 +355,8 @@ public: , m_title(title) , m_opacity(opacity) , m_has_alpha_channel(has_alpha_channel) - , m_base_size(base_size) , m_size_increment(size_increment) + , m_base_size(base_size) { }