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

WindowServer/GMenu: Adjust the popup position to fit the window inside the screen

Browse source 
Rather than passing a "top_anchored" bool. Fixes #22.
This commit is contained in:
Robin Burchell 2019-05-16 01:06:21 +02:00 • committed by Andreas Kling
parent a4b0dfff43
commit f55965b5e8
9 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Servers/WindowServer/WSAPITypes.h
View file

@ -258,7 +258,6 @@ struct WSAPI_ClientMessage {
bool checkable;
bool checked;
WSAPI_Point position;
bool top_anchored;
} menu;
struct {
WSAPI_Rect rect;

2
Servers/WindowServer/WSClientConnection.cpp
View file

@ -260,7 +260,7 @@ void WSClientConnection::handle_request(const WSAPIPopupMenuRequest& request)
return;
}
auto& menu = *(*it).value;
menu.popup(position, request.top_anchored());
menu.popup(position);
}
void WSClientConnection::handle_request(const WSAPIDismissMenuRequest& request)

5
Servers/WindowServer/WSEvent.h
View file

@ -235,22 +235,19 @@ private:
class WSAPIPopupMenuRequest : public WSAPIClientRequest {
public:
WSAPIPopupMenuRequest(int client_id, int menu_id, const Point& position, bool top_anchored)
WSAPIPopupMenuRequest(int client_id, int menu_id, const Point& position)
: WSAPIClientRequest(WSEvent::APIPopupMenuRequest, client_id)
, m_menu_id(menu_id)
, m_position(position)
, m_top_anchored(top_anchored)
{
}
int menu_id() const { return m_menu_id; }
Point position() const { return m_position; }
bool top_anchored() const { return m_top_anchored; }
private:
int m_menu_id;
Point m_position;
bool m_top_anchored;
};
class WSAPIDismissMenuRequest : public WSAPIClientRequest {

2
Servers/WindowServer/WSEventLoop.cpp
View file

@ -158,7 +158,7 @@ bool WSEventLoop::on_receive_from_client(int client_id, const WSAPI_ClientMessag
post_event(client, make<WSAPICreateMenuRequest>(client_id, String(message.text, message.text_length)));
break;
case WSAPI_ClientMessage::Type::PopupMenu:
post_event(client, make<WSAPIPopupMenuRequest>(client_id, message.menu.menu_id, message.menu.position, message.menu.top_anchored));
post_event(client, make<WSAPIPopupMenuRequest>(client_id, message.menu.menu_id, message.menu.position));
break;
case WSAPI_ClientMessage::Type::DismissMenu:
post_event(client, make<WSAPIDismissMenuRequest>(client_id, message.menu.menu_id));

18
Servers/WindowServer/WSMenu.cpp
View file

@ -4,6 +4,7 @@
#include "WSEvent.h"
#include "WSEventLoop.h"
#include "WSWindowManager.h"
#include "WSScreen.h"
#include <WindowServer/WSAPITypes.h>
#include <WindowServer/WSClientConnection.h>
#include <SharedGraphics/CharacterBitmap.h>
@ -227,14 +228,21 @@ void WSMenu::close()
menu_window()->set_visible(false);
}
void WSMenu::popup(const Point& position, bool top_anchored)
void WSMenu::popup(const Point& position)
{
ASSERT(!is_empty());
auto& window = ensure_menu_window();
if (top_anchored)
window.move_to(position);
else
window.move_to(position.translated(0, -window.height()));
const int margin = 30;
Point adjusted_pos = position;
if (adjusted_pos.x() + window.width() >= WSScreen::the().width() - margin) {
adjusted_pos = adjusted_pos.translated(-window.width(), 0);
}
if (adjusted_pos.y() + window.height() >= WSScreen::the().height() - margin) {
adjusted_pos = adjusted_pos.translated(0, -window.height());
}
window.move_to(adjusted_pos);
window.set_visible(true);
WSWindowManager::the().set_current_menu(this);
}

2
Servers/WindowServer/WSMenu.h
View file

@ -74,7 +74,7 @@ public:
void close();
void popup(const Point&, bool top_anchored);
void popup(const Point&);
private:
virtual void event(CEvent&) override;