perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add new classes FCheckMenuItem and FRadioMenuItem

This commit is contained in:
Markus Gans 2015-11-16 00:43:53 +01:00
parent bfac128c3d
commit 4778258364
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fmenu.cpp
View File

@ -628,12 +628,12 @@ void FMenu::drawItems()
{ {
FString accel_name (getKeyName(accel_key)); FString accel_name (getKeyName(accel_key));
int accel_len = int(accel_name.getLength()); int accel_len = int(accel_name.getLength());
int len = maxItemWidth - (to_char + accel_len + c + 2); int len = int(maxItemWidth) - (to_char + accel_len + c + 2);
if ( len > 0 ) if ( len > 0 )
{ {
FString spaces (len, wchar_t(' ')); FString spaces (len, wchar_t(' '));
print (spaces + accel_name); print (spaces + accel_name);
to_char = maxItemWidth - (c + 2); to_char = int(maxItemWidth) - (c + 2);
} }
} }

3
src/fmenubar.cpp
View File

@ -446,9 +446,6 @@ void FMenuBar::adjustSize()
void FMenuBar::leaveMenuBar() void FMenuBar::leaveMenuBar()
{ {
resetMenu(); resetMenu();
if ( hasSelectedItem() )
getSelectedItem()->unsetSelected();
setSelectedItem(0);
redraw(); redraw();
activatePrevWindow(); activatePrevWindow();
getActiveWindow()->getFocusWidget()->setFocus(); getActiveWindow()->getFocusWidget()->setFocus();

2
src/fwidget.cpp
View File

@ -1885,7 +1885,7 @@ void FWidget::drawShadow()
{ {
if ( x2 < xmax ) if ( x2 < xmax )
{ {
uInt block; int block;
gotoxy (x2+1, y1); gotoxy (x2+1, y1);
ch = getCoveredCharacter (x2+1, y1, this); ch = getCoveredCharacter (x2+1, y1, this);
setColor (wc.shadow_fg, ch.bg_color); setColor (wc.shadow_fg, ch.bg_color);