eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-04-25 17:15:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Demo/CatDog: Dynamically position connector for advice window

Browse Source 
Previously, the advice window used a connector at a fixed absolute
position at the middle of the bubble. This resulted in visual
disconnection as there was no logic to check if the advice bubble
was currently positioned above or below CatDog.

Changes:
- Implemented dynamic calculation for the connector's starting point.
- Added logic to detect the relative vertical position of the advice
  bubble compared to the CatDog character.
- Updated the drawing routine to flip or adjust the connector
  direction based on that relative position.

This patch ensures the connector remains visually in sync with
CatDog's position, providing a cohesive UI regardless of where the
advice window is rendered.
This commit is contained in:
Mohd Zaid
2026-01-11 09:10:54 +00:00
committed by Lucas Chollet
parent f77e12ea34
commit 3bf28c74f6
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Userland/Demos/CatDog/SpeechBubble.cpp
View File

@@ -35,19 +35,33 @@ void SpeechBubble::paint_event(GUI::PaintEvent&)
painter.clear_rect(rect(), Gfx::Color());
constexpr auto background_color = Gfx::Color::from_rgb(0xeaf688);
constexpr int connector_height = 10;
constexpr int connector_width = 5;
auto text_area = rect();
text_area.set_height(text_area.height() - 10);
text_area.set_height(text_area.height() - connector_height);
int connector_center_x = max(m_cat_dog->screen_relative_rect().x() - screen_relative_rect().x(), connector_width + 2);
int connector_joint_y = text_area.height() - 1;
int connector_point_y = rect().height();
// In case SpeechBubble is drawn below CatDog, make space for connector triangle above text_area.
if (screen_relative_rect().y() > m_cat_dog->screen_relative_rect().y()) {
connector_joint_y = connector_height;
connector_point_y = 0;
text_area.set_y(connector_height);
}
painter.draw_rect(text_area, palette().active_window_border1());
text_area.shrink(2, 2);
painter.fill_rect(text_area, background_color);
auto connector_top_left = Gfx::IntPoint { rect().width() / 2 - 5, text_area.height() + 1 };
auto connector_top_right = Gfx::IntPoint { rect().width() / 2 + 5, text_area.height() + 1 };
auto connector_bottom = Gfx::IntPoint { rect().width() / 2 + 10, rect().height() };
painter.draw_triangle(connector_top_left, connector_top_right, connector_bottom, background_color);
painter.draw_line(connector_top_left, Gfx::IntPoint { connector_bottom.x() - 1, connector_bottom.y() }, palette().active_window_border1());
painter.draw_line(connector_top_right, connector_bottom, palette().active_window_border1());
auto connector_left = Gfx::IntPoint { connector_center_x - connector_width, connector_joint_y };
auto connector_right = Gfx::IntPoint { connector_center_x + connector_width, connector_joint_y };
auto connector_last_edge = Gfx::IntPoint { connector_center_x + connector_width, connector_point_y };
painter.draw_triangle(connector_left, connector_right, connector_last_edge, background_color);
painter.draw_line(connector_right, Gfx::IntPoint { connector_last_edge.x(), connector_last_edge.y() }, palette().active_window_border1());
painter.draw_line(connector_right, connector_last_edge, palette().active_window_border1());
auto& message_list = m_cat_dog->is_artist() ? artist_messages : (m_cat_dog->is_inspector() ? inspector_messages : default_messages);
auto message = message_list[get_random<u8>() % message_list.size()];