RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:27:45 +00:00
Code Issues Activity Actions

LibGUI+WindowServer: Add support for GWidget tooltips.

Browse source 
Any GWidget can have a tooltip and it will automatically pop up below the
center of the widget when hovered. GActions added to GToolBars will use
the action text() as their tooltip automagically. :^)
This commit is contained in:
Andreas Kling 2019-04-08 18:58:44 +02:00
parent 3e175c9a96
commit 7f2eeb0b35
15 changed files with 136 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Servers/WindowServer/WSAPITypes.h
View file

@ -26,6 +26,7 @@ enum WSAPI_WindowType {
Menu,
WindowSwitcher,
Taskbar,
Tooltip,
};
struct WSAPI_WindowBackingStoreInfo {

48
Servers/WindowServer/WSClientConnection.cpp
View file

@ -124,7 +124,7 @@ void WSClientConnection::handle_request(const WSAPIDestroyMenubarRequest& reques
int menubar_id = request.menubar_id();
auto it = m_menubars.find(menubar_id);
if (it == m_menubars.end()) {
post_error("Bad menubar ID");
post_error("WSAPIDestroyMenubarRequest: Bad menubar ID");
return;
}
auto& menubar = *(*it).value;
@ -152,7 +152,7 @@ void WSClientConnection::handle_request(const WSAPIDestroyMenuRequest& request)
int menu_id = static_cast<const WSAPIDestroyMenuRequest&>(request).menu_id();
auto it = m_menus.find(menu_id);
if (it == m_menus.end()) {
post_error("Bad menu ID");
post_error("WSAPIDestroyMenuRequest: Bad menu ID");
return;
}
auto& menu = *(*it).value;
@ -169,7 +169,7 @@ void WSClientConnection::handle_request(const WSAPISetApplicationMenubarRequest&
int menubar_id = request.menubar_id();
auto it = m_menubars.find(menubar_id);
if (it == m_menubars.end()) {
post_error("Bad menubar ID");
post_error("WSAPISetApplicationMenubarRequest: Bad menubar ID");
return;
}
auto& menubar = *(*it).value;
@ -188,11 +188,11 @@ void WSClientConnection::handle_request(const WSAPIAddMenuToMenubarRequest& requ
auto it = m_menubars.find(menubar_id);
auto jt = m_menus.find(menu_id);
if (it == m_menubars.end()) {
post_error("Bad menubar ID");
post_error("WSAPIAddMenuToMenubarRequest: Bad menubar ID");
return;
}
if (jt == m_menus.end()) {
post_error("Bad menu ID");
post_error("WSAPIAddMenuToMenubarRequest: Bad menu ID");
return;
}
auto& menubar = *(*it).value;
@ -211,7 +211,7 @@ void WSClientConnection::handle_request(const WSAPIAddMenuItemRequest& request)
unsigned identifier = request.identifier();
auto it = m_menus.find(menu_id);
if (it == m_menus.end()) {
post_error("Bad menu ID");
post_error("WSAPIAddMenuItemRequest: Bad menu ID");
return;
}
auto& menu = *(*it).value;
@ -228,7 +228,7 @@ void WSClientConnection::handle_request(const WSAPIAddMenuSeparatorRequest& requ
int menu_id = request.menu_id();
auto it = m_menus.find(menu_id);
if (it == m_menus.end()) {
post_error("Bad menu ID");
post_error("WSAPIAddMenuSeparatorRequest: Bad menu ID");
return;
}
auto& menu = *(*it).value;
@ -244,7 +244,7 @@ void WSClientConnection::handle_request(const WSAPISetWindowOpacityRequest& requ
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPISetWindowOpacityRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -276,7 +276,7 @@ void WSClientConnection::handle_request(const WSAPISetWindowTitleRequest& reques
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPISetWindowTitleRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -288,7 +288,7 @@ void WSClientConnection::handle_request(const WSAPIGetWindowTitleRequest& reques
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPIGetWindowTitleRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -306,7 +306,7 @@ void WSClientConnection::handle_request(const WSAPISetWindowRectRequest& request
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPISetWindowRectRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -319,7 +319,7 @@ void WSClientConnection::handle_request(const WSAPIGetWindowRectRequest& request
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPIGetWindowRectRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -334,7 +334,7 @@ void WSClientConnection::handle_request(const WSAPISetClipboardContentsRequest&
{
auto shared_buffer = SharedBuffer::create_from_shared_buffer_id(request.shared_buffer_id());
if (!shared_buffer) {
post_error("Bad shared buffer ID");
post_error("WSAPISetClipboardContentsRequest: Bad shared buffer ID");
return;
}
WSClipboard::the().set_data(*shared_buffer, request.size());
@ -392,12 +392,16 @@ void WSClientConnection::handle_request(const WSAPIDestroyWindowRequest& request
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPIDestroyWindowRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
WSWindowManager::the().invalidate(window);
m_windows.remove(it);
WSAPI_ServerMessage response;
response.type = WSAPI_ServerMessage::Type::DidDestroyWindow;
response.window_id = window.window_id();
post_message(response);
}
void WSClientConnection::post_paint_request(const WSWindow& window, const Rect& rect)
@ -415,7 +419,7 @@ void WSClientConnection::handle_request(const WSAPIInvalidateRectRequest& reques
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPIInvalidateRectRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -427,7 +431,7 @@ void WSClientConnection::handle_request(const WSAPIDidFinishPaintingNotification
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPIDidFinishPaintingNotification: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -446,7 +450,7 @@ void WSClientConnection::handle_request(const WSAPIGetWindowBackingStoreRequest&
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPIGetWindowBackingStoreRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -468,7 +472,7 @@ void WSClientConnection::handle_request(const WSAPISetWindowBackingStoreRequest&
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPISetWindowBackingStoreRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -500,7 +504,7 @@ void WSClientConnection::handle_request(const WSAPISetGlobalCursorTrackingReques
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPISetGlobalCursorTrackingRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -512,7 +516,7 @@ void WSClientConnection::handle_request(const WSAPISetWindowOverrideCursorReques
int window_id = request.window_id();
auto it = m_windows.find(window_id);
if (it == m_windows.end()) {
post_error("Bad window ID");
post_error("WSAPISetWindowOverrideCursorRequest: Bad window ID");
return;
}
auto& window = *(*it).value;
@ -523,12 +527,12 @@ void WSClientConnection::handle_request(const WSWMAPISetActiveWindowRequest& req
{
auto* client = WSClientConnection::from_client_id(request.target_client_id());
if (!client) {
post_error("Bad client ID");
post_error("WSWMAPISetActiveWindowRequest: Bad client ID");
return;
}
auto it = client->m_windows.find(request.target_window_id());
if (it == client->m_windows.end()) {
post_error("Bad window ID");
post_error("WSWMAPISetActiveWindowRequest: Bad window ID");
return;
}
auto& window = *(*it).value;

2
Servers/WindowServer/WSMessageLoop.cpp
View file

@ -260,6 +260,8 @@ static WSWindowType from_api(WSAPI_WindowType api_type)
return WSWindowType::WindowSwitcher;
case WSAPI_WindowType::Taskbar:
return WSWindowType::Taskbar;
case WSAPI_WindowType::Tooltip:
return WSWindowType::Tooltip;
default:
ASSERT_NOT_REACHED();
}

2
Servers/WindowServer/WSWindow.cpp
View file

@ -107,6 +107,8 @@ static WSAPI_WindowType to_api(WSWindowType ws_type)
return WSAPI_WindowType::WindowSwitcher;
case WSWindowType::Taskbar:
return WSAPI_WindowType::Taskbar;
case WSWindowType::Tooltip:
return WSAPI_WindowType::Tooltip;
default:
ASSERT_NOT_REACHED();
}

5
Servers/WindowServer/WSWindowFrame.cpp
View file

@ -119,6 +119,9 @@ void WSWindowFrame::paint(Painter& painter)
if (m_window.type() == WSWindowType::Taskbar)
return;
if (m_window.type() == WSWindowType::Tooltip)
return;
auto& window = m_window;
auto titlebar_rect = title_bar_rect();
@ -195,6 +198,8 @@ static Rect frame_rect_for_window_type(WSWindowType type, const Rect& rect)
return rect;
case WSWindowType::Taskbar:
return rect;
case WSWindowType::Tooltip:
return rect;
default:
ASSERT_NOT_REACHED();
}

4
Servers/WindowServer/WSWindowManager.h
View file

@ -251,6 +251,8 @@ IterationDecision WSWindowManager::for_each_visible_window_from_back_to_front(Ca
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Taskbar, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_back_to_front(WSWindowType::Tooltip, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
return for_each_visible_window_of_type_from_back_to_front(WSWindowType::WindowSwitcher, callback);
}
@ -282,6 +284,8 @@ IterationDecision WSWindowManager::for_each_visible_window_from_front_to_back(Ca
{
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Taskbar, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Tooltip, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Menu, callback) == IterationDecision::Abort)
return IterationDecision::Abort;
if (for_each_visible_window_of_type_from_front_to_back(WSWindowType::Normal, callback) == IterationDecision::Abort)

1
Servers/WindowServer/WSWindowType.h
View file

@ -6,4 +6,5 @@ enum class WSWindowType {
Menu,
WindowSwitcher,
Taskbar,
Tooltip,
};