Skip to content

Fix: menu lists can overflow the rendered window #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Nidrax wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

Fix: menu lists can overflow the rendered window #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe8470b
Make overflowing menus scroll instead of running off-screen
github-actions[bot] Aug 26, 2026
7da2883
Auto-scroll menus by hovering the fixed arrows
github-actions[bot] Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions src/app/ui/skin/skin_theme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,10 +1580,27 @@ namespace app::skin

void SkinTheme::paintMenu(PaintEvent& ev)
{
const Widget* widget = ev.getSource();
const auto widget = static_cast<const ui::Menu*>(ev.getSource());
Graphics* g = ev.graphics();

g->fillRect(BGCOLOR, g->getClipBounds());

// When the menu doesn't fit in the display, draw scroll
// indicators over the reserved strips at the top/bottom.
if (widget->canScrollUp()) {
const gfx::Rect rc = widget->scrollUpBounds();
she::Surface* icon = parts.comboboxArrowUpSelected()->bitmap(0);
g->drawRgbaSurface(icon,
rc.x + rc.w/2 - icon->width()/2,
rc.y + rc.h/2 - icon->height()/2);
}
if (widget->canScrollDown()) {
const gfx::Rect rc = widget->scrollDownBounds();
she::Surface* icon = parts.comboboxArrowDownSelected()->bitmap(0);
g->drawRgbaSurface(icon,
rc.x + rc.w/2 - icon->width()/2,
rc.y + rc.h/2 - icon->height()/2);
}
}

void SkinTheme::paintMenuItem(PaintEvent& ev)
Expand Down Expand Up @@ -1648,29 +1665,20 @@ namespace app::skin

// For menu-box
if (!bar) {
// Draw the arrown (to indicate which this menu has a sub-menu)
// Draw the arrow (to indicate that this menu has a sub-menu)
if (widget->getSubmenu())
{
int c;
// Enabled
if (widget->isEnabled()) {
for (c = 0; c < 3 * scale; c++)
g->drawVLine(fg,
bounds.x2() - 3 * scale - c,
bounds.y + bounds.h / 2 - c, 2 * c + 1);
}
// Disabled
else {
for (c = 0; c < 3 * scale; c++)
g->drawVLine(colors.background(),
bounds.x2() - 3 * scale - c + 1,
bounds.y + bounds.h / 2 - c + 1, 2 * c + 1);

for (c = 0; c < 3 * scale; c++)
g->drawVLine(colors.disabled(),
bounds.x2() - 3 * scale - c,
bounds.y + bounds.h / 2 - c, 2 * c + 1);
}
she::Surface* icon;
if (!widget->isEnabled())
icon = parts.comboboxArrowRightDisabled()->bitmap(0);
else if (widget->isHighlighted())
icon = parts.comboboxArrowRightSelected()->bitmap(0);
else
icon = parts.comboboxArrowRight()->bitmap(0);

const int x = bounds.x2() - 3 * scale - icon->width();
const int y = bounds.y + bounds.h / 2 - icon->height() / 2;
g->drawRgbaSurface(icon, x, y);
}
// Draw the keyboard shortcut
else if (const auto appMenuItem = dynamic_cast<AppMenuItem*>(widget)) {
Expand Down
Loading
Loading