caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Highlight pending operation on toolbar, even if started via keyboard.

Browse Source
This commit is contained in:
whitequark 2015-03-30 00:37:21 +03:00
parent 46db5378dc
commit f89020ad26
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphicswin.cpp
View File

@ -945,6 +945,7 @@ void GraphicsWindow::MenuRequest(int id) {
SS.TW.GoToScreen(TextWindow::SCREEN_TANGENT_ARC); SS.TW.GoToScreen(TextWindow::SCREEN_TANGENT_ARC);
SS.GW.ForceTextWindowShown(); SS.GW.ForceTextWindowShown();
SS.ScheduleShowTW(); SS.ScheduleShowTW();
InvalidateGraphics(); // repaint toolbar
} }
break; break;
@ -960,6 +961,7 @@ c:
SS.GW.pending.operation = id; SS.GW.pending.operation = id;
SS.GW.pending.description = s; SS.GW.pending.description = s;
SS.ScheduleShowTW(); SS.ScheduleShowTW();
InvalidateGraphics(); // repaint toolbar
break; break;
case MNU_CONSTRUCTION: { case MNU_CONSTRUCTION: {

3
src/toolbar.cpp
View File

@ -168,7 +168,8 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,
glRasterPos2i(x - 12, y - 12); glRasterPos2i(x - 12, y - 12);
glDrawPixels(24, 24, GL_RGB, GL_UNSIGNED_BYTE, Toolbar[i].image); glDrawPixels(24, 24, GL_RGB, GL_UNSIGNED_BYTE, Toolbar[i].image);
if(toolbarHovered == Toolbar[i].menu) { if(toolbarHovered == Toolbar[i].menu ||
pending.operation == Toolbar[i].menu) {
// Highlight the hovered or pending item. // Highlight the hovered or pending item.
glColor4d(1, 1, 0, 0.3); glColor4d(1, 1, 0, 0.3);
int boxhw = 15; int boxhw = 15;