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

Move 4/3 shrink in display panel

Browse source
This commit is contained in:
Chips 2016-05-15 20:41:34 +00:00
parent 7773c9ccca
commit 2ccfd7075d
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/od-pandora/gui/PanelDisplay.cpp
View file

@ -40,6 +40,8 @@ static gcn::UaeCheckBox* chkFrameskip;
static gcn::Label* lblFSRatio;
static gcn::Label* lblFSRatioInfo;
static gcn::Slider* sldFSRatio;
static gcn::UaeCheckBox* chkAspect;
#endif
@ -85,6 +87,8 @@ class AmigaScreenActionListener : public gcn::ActionListener
RefreshPanelDisplay();
}
}
else if (actionEvent.getSource() == chkAspect)
changed_prefs.gfx_correct_aspect = chkAspect->isSelected();
#endif
}
};
@ -144,6 +148,10 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
sldFSRatio->setId("FSRatio");
sldFSRatio->addActionListener(amigaScreenActionListener);
lblFSRatioInfo = new gcn::Label("100%%");
chkAspect = new gcn::UaeCheckBox("4/3 ratio shrink");
chkAspect->addActionListener(amigaScreenActionListener);
#endif
chkFrameskip = new gcn::UaeCheckBox("Frameskip");
@ -179,7 +187,13 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
grpAmigaScreen->setBaseColor(gui_baseCol);
category.panel->add(grpAmigaScreen);
#ifdef RASPBERRY
category.panel->add(chkAspect , DISTANCE_BORDER, DISTANCE_BORDER + grpAmigaScreen->getHeight() + DISTANCE_NEXT_Y);
category.panel->add(chkFrameskip, DISTANCE_BORDER, DISTANCE_BORDER + grpAmigaScreen->getHeight() + chkAspect->getHeight() + 2*DISTANCE_NEXT_Y);
#else
category.panel->add(chkFrameskip, DISTANCE_BORDER, DISTANCE_BORDER + grpAmigaScreen->getHeight() + DISTANCE_NEXT_Y);
#endif
RefreshPanelDisplay();
}
@ -203,6 +217,8 @@ void ExitPanelDisplay(void)
delete lblFSRatio;
delete sldFSRatio;
delete lblFSRatioInfo;
delete chkAspect;
#endif
}
@ -245,6 +261,8 @@ void RefreshPanelDisplay(void)
break;
}
}
chkAspect->setSelected(changed_prefs.gfx_correct_aspect);
#endif
sldVertPos->setValue(changed_prefs.pandora_vertical_offset);

24
src/od-pandora/gui/PanelMisc.cpp
View file

@ -22,9 +22,6 @@
static gcn::UaeCheckBox* chkStatusLine;
static gcn::UaeCheckBox* chkShowGUI;
#ifdef RASPBERRY
static gcn::UaeCheckBox* chkAspect;
#endif
#ifdef PANDORA_SPECIFIC
static gcn::Label* lblPandoraSpeed;
static gcn::Label* lblPandoraSpeedInfo;
@ -47,10 +44,7 @@ class MiscActionListener : public gcn::ActionListener
else if (actionEvent.getSource() == chkBSDSocket)
changed_prefs.socket_emu = chkBSDSocket->isSelected();
#ifdef RASPBERRY
else if (actionEvent.getSource() == chkAspect)
changed_prefs.gfx_correct_aspect = chkAspect->isSelected();
#endif
#ifdef PANDORA_SPECIFIC
else if (actionEvent.getSource() == sldPandoraSpeed)
{
@ -79,10 +73,6 @@ void InitPanelMisc(const struct _ConfigCategory& category)
chkShowGUI->setId("ShowGUI");
chkShowGUI->addActionListener(miscActionListener);
#ifdef RASPBERRY
chkAspect = new gcn::UaeCheckBox("4/3 ratio shrink");
chkAspect->addActionListener(miscActionListener);
#endif
#ifdef PANDORA_SPECIFIC
lblPandoraSpeed = new gcn::Label("Pandora Speed:");
lblPandoraSpeed->setSize(110, LABEL_HEIGHT);
@ -97,7 +87,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
lblPandoraSpeedInfo = new gcn::Label("1000 MHz");
#endif
chkBSDSocket = new gcn::UaeCheckBox("bsdsocket.library");
chkBSDSocket = new gcn::UaeCheckBox("bsdsocket.library");
chkBSDSocket->setId("BSDSocket");
chkBSDSocket->addActionListener(miscActionListener);
@ -106,10 +96,6 @@ void InitPanelMisc(const struct _ConfigCategory& category)
posY += chkStatusLine->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(chkShowGUI, DISTANCE_BORDER, posY);
posY += chkShowGUI->getHeight() + DISTANCE_NEXT_Y;
#ifdef RASPBERRY
category.panel->add(chkAspect, DISTANCE_BORDER, posY);
posY += chkAspect->getHeight() + DISTANCE_NEXT_Y;
#endif
#ifdef PANDORA_SPECIFIC
category.panel->add(lblPandoraSpeed, DISTANCE_BORDER, posY);
category.panel->add(sldPandoraSpeed, DISTANCE_BORDER + lblPandoraSpeed->getWidth() + 8, posY);
@ -126,9 +112,6 @@ void ExitPanelMisc(void)
{
delete chkStatusLine;
delete chkShowGUI;
#ifdef RASPBERRY
delete chkAspect;
#endif
#ifdef PANDORA_SPECIFIC
delete lblPandoraSpeed;
delete sldPandoraSpeed;
@ -145,9 +128,6 @@ void RefreshPanelMisc(void)
chkStatusLine->setSelected(changed_prefs.leds_on_screen);
chkShowGUI->setSelected(changed_prefs.start_gui);
#ifdef RASPBERRY
chkAspect->setSelected(changed_prefs.gfx_correct_aspect);
#endif
#ifdef PANDORA_SPECIFIC
sldPandoraSpeed->setValue(changed_prefs.pandora_cpu_speed);
snprintf(tmp, 20, "%d MHz", changed_prefs.pandora_cpu_speed);