pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed dropdown controls height in all Panels

Browse source
This commit is contained in:
Dimitris Panokostas 2018-01-23 21:56:35 +01:00
parent ef440d7988
commit 40d1490e6e
9 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/osdep/gui/PanelChipset.cpp
View file

@ -215,7 +215,7 @@ void InitPanelChipset(const struct _ConfigCategory& category)
lblChipset = new gcn::Label("Extra:");
lblChipset->setAlignment(gcn::Graphics::RIGHT);
cboChipset = new gcn::UaeDropDown(&chipsetList);
cboChipset->setSize(75, DROPDOWN_HEIGHT);
cboChipset->setSize(75, cboChipset->getHeight());
cboChipset->setBaseColor(gui_baseCol);
cboChipset->setBackgroundColor(colTextboxBackground);
cboChipset->setId("ChipsetExtra");

2
src/osdep/gui/PanelCustom.cpp
View file

@ -468,7 +468,7 @@ void InitPanelCustom(const struct _ConfigCategory& category)
lblCustomAction[i]->setAlignment(gcn::Graphics::RIGHT);
cboCustomAction[i] = new gcn::UaeDropDown(&CustomEventList);
cboCustomAction[i]->setSize(cboCustomAction[i]->getWidth()*2, DROPDOWN_HEIGHT);
cboCustomAction[i]->setSize(cboCustomAction[i]->getWidth()*2, cboCustomAction[i]->getHeight());
cboCustomAction[i]->setBaseColor(gui_baseCol);
cboCustomAction[i]->setBackgroundColor(colTextboxBackground);

5
src/osdep/gui/PanelFloppy.cpp
View file

@ -396,7 +396,6 @@ void InitPanelFloppy(const struct _ConfigCategory& category)
chkDFx[i]->addActionListener(dfxCheckActionListener);
cboDFxType[i] = new gcn::UaeDropDown(&driveTypeList);
cboDFxType[i]->setSize(106, DROPDOWN_HEIGHT);
cboDFxType[i]->setBaseColor(gui_baseCol);
cboDFxType[i]->setBackgroundColor(colTextboxBackground);
snprintf(tmp, 20, "cboType%d", i);
@ -428,7 +427,7 @@ void InitPanelFloppy(const struct _ConfigCategory& category)
cmdDFxSelect[i]->addActionListener(dfxButtonActionListener);
cboDFxFile[i] = new gcn::UaeDropDown(&diskfileList);
cboDFxFile[i]->setSize(textFieldWidth, TEXTFIELD_HEIGHT);
cboDFxFile[i]->setSize(textFieldWidth, cboDFxFile[i]->getHeight());
cboDFxFile[i]->setBaseColor(gui_baseCol);
cboDFxFile[i]->setBackgroundColor(colTextboxBackground);
snprintf(tmp, 20, "cboDisk%d", i);
@ -485,7 +484,7 @@ void InitPanelFloppy(const struct _ConfigCategory& category)
category.panel->add(cmdDFxEject[i], posX, posY);
posX += cmdDFxEject[i]->getWidth() + DISTANCE_NEXT_X;
category.panel->add(cmdDFxSelect[i], posX, posY);
posY += chkDFx[i]->getHeight() + 8;
posY += cmdDFxEject[i]->getHeight() + 8;
category.panel->add(cboDFxFile[i], DISTANCE_BORDER, posY);
if (i == 0)

2
src/osdep/gui/PanelHD.cpp
View file

@ -438,7 +438,7 @@ void InitPanelHD(const struct _ConfigCategory& category)
cmdCDSelect->addActionListener(cdButtonActionListener);
cboCDFile = new gcn::UaeDropDown(&cdfileList);
cboCDFile->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, DROPDOWN_HEIGHT);
cboCDFile->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboCDFile->getHeight());
cboCDFile->setBaseColor(gui_baseCol);
cboCDFile->setBackgroundColor(colTextboxBackground);
cboCDFile->setId("cboCD");

18
src/osdep/gui/PanelInput.cpp
View file

@ -299,14 +299,14 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblPort0 = new gcn::Label("Port 0 [Mouse]:");
lblPort0->setAlignment(gcn::Graphics::RIGHT);
cboPort0 = new gcn::UaeDropDown(&ctrlPortList);
cboPort0->setSize(textFieldWidth/2, DROPDOWN_HEIGHT);
cboPort0->setSize(textFieldWidth/2, cboPort0->getHeight());
cboPort0->setBaseColor(gui_baseCol);
cboPort0->setBackgroundColor(colTextboxBackground);
cboPort0->setId("cboPort0");
cboPort0->addActionListener(inputActionListener);
cboPort0mode = new gcn::UaeDropDown(&ctrlPortModeList);
cboPort0mode->setSize(cboPort0mode->getWidth(), DROPDOWN_HEIGHT);
cboPort0mode->setSize(cboPort0mode->getWidth(), cboPort0mode->getHeight());
cboPort0mode->setBaseColor(gui_baseCol);
cboPort0mode->setBackgroundColor(colTextboxBackground);
cboPort0mode->setId("cboPort0mode");
@ -316,14 +316,14 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblPort1->setAlignment(gcn::Graphics::RIGHT);
lblPort0->setSize(lblPort1->getWidth(), lblPort0->getHeight());
cboPort1 = new gcn::UaeDropDown(&ctrlPortList);
cboPort1->setSize(textFieldWidth/2, DROPDOWN_HEIGHT);
cboPort1->setSize(textFieldWidth/2, cboPort1->getHeight());
cboPort1->setBaseColor(gui_baseCol);
cboPort1->setBackgroundColor(colTextboxBackground);
cboPort1->setId("cboPort1");
cboPort1->addActionListener(inputActionListener);
cboPort1mode = new gcn::UaeDropDown(&ctrlPortModeList);
cboPort1mode->setSize(cboPort1mode->getWidth(), DROPDOWN_HEIGHT);
cboPort1mode->setSize(cboPort1mode->getWidth(), cboPort1mode->getHeight());
cboPort1mode->setBaseColor(gui_baseCol);
cboPort1mode->setBackgroundColor(colTextboxBackground);
cboPort1mode->setId("cboPort1mode");
@ -332,7 +332,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblPort2 = new gcn::Label("Port 2 [Parallel 1]:");
lblPort2->setAlignment(gcn::Graphics::LEFT);
cboPort2 = new gcn::UaeDropDown(&ctrlPortList);
cboPort2->setSize(textFieldWidth/2, DROPDOWN_HEIGHT);
cboPort2->setSize(textFieldWidth/2, cboPort2->getHeight());
cboPort2->setBaseColor(gui_baseCol);
cboPort2->setBackgroundColor(colTextboxBackground);
cboPort2->setId("cboPort2");
@ -341,7 +341,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblPort3 = new gcn::Label("Port 3 [Parallel 2]:");
lblPort3->setAlignment(gcn::Graphics::LEFT);
cboPort3 = new gcn::UaeDropDown(&ctrlPortList);
cboPort3->setSize(textFieldWidth/2, DROPDOWN_HEIGHT);
cboPort3->setSize(textFieldWidth/2, cboPort3->getHeight());
cboPort3->setBaseColor(gui_baseCol);
cboPort3->setBackgroundColor(colTextboxBackground);
cboPort3->setId("cboPort3");
@ -350,7 +350,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblPort0mousemode = new gcn::Label("Mouse Stick 0:");
lblPort0mousemode->setAlignment(gcn::Graphics::RIGHT);
cboPort0mousemode = new gcn::UaeDropDown(&ctrlPortMouseModeList);
cboPort0mousemode->setSize(68, DROPDOWN_HEIGHT);
cboPort0mousemode->setSize(68, cboPort0mousemode->getHeight());
cboPort0mousemode->setBaseColor(gui_baseCol);
cboPort0mousemode->setBackgroundColor(colTextboxBackground);
cboPort0mousemode->setId("cboPort0mousemode");
@ -359,7 +359,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblPort1mousemode = new gcn::Label("Mouse Stick 1:");
lblPort1mousemode->setAlignment(gcn::Graphics::RIGHT);
cboPort1mousemode = new gcn::UaeDropDown(&ctrlPortMouseModeList);
cboPort1mousemode->setSize(68, DROPDOWN_HEIGHT);
cboPort1mousemode->setSize(68, cboPort1mousemode->getHeight());
cboPort1mousemode->setBaseColor(gui_baseCol);
cboPort1mousemode->setBackgroundColor(colTextboxBackground);
cboPort1mousemode->setId("cboPort1mousemode");
@ -368,7 +368,7 @@ void InitPanelInput(const struct _ConfigCategory& category)
lblAutofire = new gcn::Label("Autofire Rate:");
lblAutofire->setAlignment(gcn::Graphics::RIGHT);
cboAutofire = new gcn::UaeDropDown(&autofireList);
cboAutofire->setSize(80, DROPDOWN_HEIGHT);
cboAutofire->setSize(80, cboAutofire->getHeight());
cboAutofire->setBaseColor(gui_baseCol);
cboAutofire->setBackgroundColor(colTextboxBackground);
cboAutofire->setId("cboAutofire");

12
src/osdep/gui/PanelQuickstart.cpp
View file

@ -638,7 +638,7 @@ void InitPanelQuickstart(const struct _ConfigCategory& category)
lblModel = new gcn::Label("Amiga model:");
lblModel->setAlignment(gcn::Graphics::RIGHT);
cboModel = new gcn::UaeDropDown(&amigaModelList);
cboModel->setSize(160, DROPDOWN_HEIGHT);
cboModel->setSize(160, cboModel->getHeight());
cboModel->setBaseColor(gui_baseCol);
cboModel->setBackgroundColor(colTextboxBackground);
cboModel->setId("qscboAModel");
@ -647,7 +647,7 @@ void InitPanelQuickstart(const struct _ConfigCategory& category)
lblConfig = new gcn::Label("Config:");
lblConfig->setAlignment(gcn::Graphics::RIGHT);
cboConfig = new gcn::UaeDropDown(&amigaConfigList);
cboConfig->setSize(category.panel->getWidth() - lblConfig->getWidth() - 8 - 2 * DISTANCE_BORDER, DROPDOWN_HEIGHT);
cboConfig->setSize(category.panel->getWidth() - lblConfig->getWidth() - 8 - 2 * DISTANCE_BORDER, cboConfig->getHeight());
cboConfig->setBaseColor(gui_baseCol);
cboConfig->setBackgroundColor(colTextboxBackground);
cboConfig->setId("qscboAConfig");
@ -686,14 +686,14 @@ void InitPanelQuickstart(const struct _ConfigCategory& category)
cmdDFxEject[i]->addActionListener(dfxButtonActionListener);
cmdDFxSelect[i] = new gcn::Button("Select file");
cmdDFxSelect[i]->setSize(BUTTON_WIDTH, SMALL_BUTTON_HEIGHT);
cmdDFxSelect[i]->setSize(BUTTON_WIDTH + 8, SMALL_BUTTON_HEIGHT);
cmdDFxSelect[i]->setBaseColor(gui_baseCol);
snprintf(tmp, 20, "qscmdSel%d", i);
cmdDFxSelect[i]->setId(tmp);
cmdDFxSelect[i]->addActionListener(dfxButtonActionListener);
cboDFxFile[i] = new gcn::UaeDropDown(&diskfileList);
cboDFxFile[i]->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, DROPDOWN_HEIGHT);
cboDFxFile[i]->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboDFxFile[i]->getHeight());
cboDFxFile[i]->setBaseColor(gui_baseCol);
cboDFxFile[i]->setBackgroundColor(colTextboxBackground);
snprintf(tmp, 20, "qscboDisk%d", i);
@ -718,7 +718,7 @@ void InitPanelQuickstart(const struct _ConfigCategory& category)
cmdCDSelect->addActionListener(cdButtonActionListener);
cboCDFile = new gcn::UaeDropDown(&cdfileList);
cboCDFile->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, DROPDOWN_HEIGHT);
cboCDFile->setSize(category.panel->getWidth() - 2 * DISTANCE_BORDER, cboCDFile->getHeight());
cboCDFile->setBaseColor(gui_baseCol);
cboCDFile->setBackgroundColor(colTextboxBackground);
cboCDFile->setId("qscboCD");
@ -754,7 +754,7 @@ void InitPanelQuickstart(const struct _ConfigCategory& category)
category.panel->add(cmdDFxEject[i], posX, posY);
posX += cmdDFxEject[i]->getWidth() + DISTANCE_NEXT_X;
category.panel->add(cmdDFxSelect[i], posX, posY);
posY += chkDFx[i]->getHeight() + 8;
posY += cmdDFxEject[i]->getHeight() + 8;
category.panel->add(cboDFxFile[i], DISTANCE_BORDER, posY);
posY += cboDFxFile[i]->getHeight() + DISTANCE_NEXT_Y + 4;

6
src/osdep/gui/PanelROM.cpp
View file

@ -215,7 +215,7 @@ void InitPanelROM(const struct _ConfigCategory& category)
lblMainROM = new gcn::Label("Main ROM File:");
cboMainROM = new gcn::UaeDropDown(mainROMList);
cboMainROM->setSize(textFieldWidth, DROPDOWN_HEIGHT);
cboMainROM->setSize(textFieldWidth, cboMainROM->getHeight());
cboMainROM->setBaseColor(gui_baseCol);
cboMainROM->setBackgroundColor(colTextboxBackground);
cboMainROM->setId("cboMainROM");
@ -228,7 +228,7 @@ void InitPanelROM(const struct _ConfigCategory& category)
lblExtROM = new gcn::Label("Extended ROM File:");
cboExtROM = new gcn::UaeDropDown(extROMList);
cboExtROM->setSize(textFieldWidth, DROPDOWN_HEIGHT);
cboExtROM->setSize(textFieldWidth, cboExtROM->getHeight());
cboExtROM->setBaseColor(gui_baseCol);
cboExtROM->setBackgroundColor(colTextboxBackground);
cboExtROM->setId("cboExtROM");
@ -241,7 +241,7 @@ void InitPanelROM(const struct _ConfigCategory& category)
lblCartROM = new gcn::Label("Cartridge ROM File:");
cboCartROM = new gcn::UaeDropDown(cartROMList);
cboCartROM->setSize(textFieldWidth, DROPDOWN_HEIGHT);
cboCartROM->setSize(textFieldWidth, cboCartROM->getHeight());
cboCartROM->setBaseColor(gui_baseCol);
cboCartROM->setBackgroundColor(colTextboxBackground);
cboCartROM->setId("cboCartROM");

6
src/osdep/gui/PanelSound.cpp
View file

@ -274,7 +274,7 @@ void InitPanelSound(const struct _ConfigCategory& category)
lblFrequency = new gcn::Label("Frequency:");
lblFrequency->setAlignment(gcn::Graphics::RIGHT);
cboFrequency = new gcn::UaeDropDown(&frequencyTypeList);
cboFrequency->setSize(160, DROPDOWN_HEIGHT);
cboFrequency->setSize(160, cboFrequency->getHeight());
cboFrequency->setBaseColor(gui_baseCol);
cboFrequency->setBackgroundColor(colTextboxBackground);
cboFrequency->setId("cboFrequency");
@ -296,7 +296,7 @@ void InitPanelSound(const struct _ConfigCategory& category)
lblInterpolation = new gcn::Label("Interpolation:");
lblInterpolation->setAlignment(gcn::Graphics::RIGHT);
cboInterpolation = new gcn::UaeDropDown(&interpolationTypeList);
cboInterpolation->setSize(160, DROPDOWN_HEIGHT);
cboInterpolation->setSize(160, cboInterpolation->getHeight());
cboInterpolation->setBaseColor(gui_baseCol);
cboInterpolation->setBackgroundColor(colTextboxBackground);
cboInterpolation->setId("cboInterpol");
@ -305,7 +305,7 @@ void InitPanelSound(const struct _ConfigCategory& category)
lblFilter = new gcn::Label("Filter:");
lblFilter->setAlignment(gcn::Graphics::RIGHT);
cboFilter = new gcn::UaeDropDown(&filterTypeList);
cboFilter->setSize(160, DROPDOWN_HEIGHT);
cboFilter->setSize(160, cboFilter->getHeight());
cboFilter->setBaseColor(gui_baseCol);
cboFilter->setBackgroundColor(colTextboxBackground);
cboFilter->setId("cboFilter");

1
src/osdep/gui/SelectFolder.cpp
View file

@ -52,6 +52,7 @@ public:
if (actionEvent.getSource() == cmdOK)
{
dialogResult = true;
}
dialogFinished = true;
}