diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/FbTk/Menu.cc | 3 | ||||
-rw-r--r-- | src/FbTk/MenuItem.cc | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,6 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.16: | 2 | Changes for 0.9.16: |
3 | *06/04/22: | 3 | *06/04/22: |
4 | * Fix workspace menu corruption when window title changes (Simon) | ||
5 | sf.net bug #1113668 | ||
6 | Menu.cc MenuItem.cc | ||
4 | * Fix crash when toolbar disabled (Simon) | 7 | * Fix crash when toolbar disabled (Simon) |
5 | Slit.hh/cc Screen.cc | 8 | Slit.hh/cc Screen.cc |
6 | * Couple of memory-based fixes from valgrind (Simon) | 9 | * Couple of memory-based fixes from valgrind (Simon) |
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 0616906..4775ae9 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -444,6 +444,9 @@ void Menu::updateMenu(int active_index) { | |||
444 | 444 | ||
445 | // must update main window size whether visible or not | 445 | // must update main window size whether visible or not |
446 | // the rest can wait until the end | 446 | // the rest can wait until the end |
447 | if (menu.window.width() != new_width) | ||
448 | m_need_update = true; | ||
449 | |||
447 | menu.window.resize(new_width, new_height); | 450 | menu.window.resize(new_width, new_height); |
448 | 451 | ||
449 | if (!isVisible()) | 452 | if (!isVisible()) |
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc index f39d03c..f8ec4e9 100644 --- a/src/FbTk/MenuItem.cc +++ b/src/FbTk/MenuItem.cc | |||
@@ -114,7 +114,7 @@ void MenuItem::draw(FbDrawable &draw, | |||
114 | theme.frameFont().drawText(draw, // drawable | 114 | theme.frameFont().drawText(draw, // drawable |
115 | theme.screenNum(), | 115 | theme.screenNum(), |
116 | tgc.gc(), | 116 | tgc.gc(), |
117 | m_label.c_str(), m_label.size(), // text string and lenght | 117 | label().c_str(), label().size(), // text string and lenght |
118 | text_x, text_y); // position | 118 | text_x, text_y); // position |
119 | } | 119 | } |
120 | 120 | ||