ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed ComboDialog

This commit is contained in:
thrust26 2018-08-05 22:58:35 +02:00
parent 4949c2c7bb
commit 4013eb0e0b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/graphics/eventmapping_combo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

5
src/gui/ComboDialog.cxx
View File

@ -29,7 +29,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font, ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font,
const VariantList& combolist) const VariantList& combolist)
: Dialog(boss->instance(), boss->parent(), font, ""), : Dialog(boss->instance(), boss->parent(), font, "Add..."),
myComboEvent(Event::NoType) myComboEvent(Event::NoType)
{ {
const int lineHeight = font.getLineHeight(), const int lineHeight = font.getLineHeight(),
@ -38,7 +38,7 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font,
WidgetArray wid; WidgetArray wid;
// Set real dimensions // Set real dimensions
_w = 35 * fontWidth + 10; _w = 33 * fontWidth + 10*2;
_h = 10 * (lineHeight + 4) + 10 + _th; _h = 10 * (lineHeight + 4) + 10 + _th;
xpos = 10; xpos = 10;
ypos = 10 + _th; ypos = 10 + _th;
@ -57,7 +57,6 @@ ComboDialog::ComboDialog(GuiObject* boss, const GUI::Font& font,
ypos += lineHeight + 4; ypos += lineHeight + 4;
}; };
xpos = 10;
myEvents[0] = nullptr; ADD_EVENT_POPUP(0, "Event 1 "); myEvents[0] = nullptr; ADD_EVENT_POPUP(0, "Event 1 ");
myEvents[1] = nullptr; ADD_EVENT_POPUP(1, "Event 2 "); myEvents[1] = nullptr; ADD_EVENT_POPUP(1, "Event 2 ");
myEvents[2] = nullptr; ADD_EVENT_POPUP(2, "Event 3 "); myEvents[2] = nullptr; ADD_EVENT_POPUP(2, "Event 3 ");