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

Added Scaling Method option in GUI

Browse source
This commit is contained in:
Dimitris Panokostas 2017-02-23 01:07:28 +01:00
parent 6509317d62
commit efa82628d5
2 changed files with 60 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/include/options.h
View file

@ -179,6 +179,7 @@ struct uae_prefs {
int kbd_led_num; int kbd_led_num;
int kbd_led_scr; int kbd_led_scr;
int kbd_led_cap; int kbd_led_cap;
int scaling_method;
#endif #endif
bool immediate_blits; bool immediate_blits;

64
src/osdep/gui/PanelDisplay.cpp
View file

@ -28,25 +28,29 @@ static gcn::Label* lblAmigaHeight;
static gcn::Label* lblAmigaHeightInfo; static gcn::Label* lblAmigaHeightInfo;
static gcn::Slider* sldAmigaHeight; static gcn::Slider* sldAmigaHeight;
static gcn::UaeCheckBox* chkFrameskip; static gcn::UaeCheckBox* chkFrameskip;
static gcn::Window* grpScalingMethod;
static gcn::UaeRadioButton* optAuto;
static gcn::UaeRadioButton* optNearest;
static gcn::UaeRadioButton* optLinear;
class AmigaScreenActionListener : public gcn::ActionListener class AmigaScreenActionListener : public gcn::ActionListener
{ {
public: public:
void action(const gcn::ActionEvent& actionEvent) void action(const gcn::ActionEvent& actionEvent) override
{ {
if (actionEvent.getSource() == sldAmigaWidth) if (actionEvent.getSource() == sldAmigaWidth)
{ {
if (changed_prefs.gfx_size.width != amigawidth_values[(int)(sldAmigaWidth->getValue())]) if (changed_prefs.gfx_size.width != amigawidth_values[int(sldAmigaWidth->getValue())])
{ {
changed_prefs.gfx_size.width = amigawidth_values[(int)(sldAmigaWidth->getValue())]; changed_prefs.gfx_size.width = amigawidth_values[int(sldAmigaWidth->getValue())];
RefreshPanelDisplay(); RefreshPanelDisplay();
} }
} }
else if (actionEvent.getSource() == sldAmigaHeight) else if (actionEvent.getSource() == sldAmigaHeight)
{ {
if (changed_prefs.gfx_size.height != amigaheight_values[(int)(sldAmigaHeight->getValue())]) if (changed_prefs.gfx_size.height != amigaheight_values[int(sldAmigaHeight->getValue())])
{ {
changed_prefs.gfx_size.height = amigaheight_values[(int)(sldAmigaHeight->getValue())]; changed_prefs.gfx_size.height = amigaheight_values[int(sldAmigaHeight->getValue())];
RefreshPanelDisplay(); RefreshPanelDisplay();
} }
} }
@ -59,6 +63,21 @@ public:
AmigaScreenActionListener* amigaScreenActionListener; AmigaScreenActionListener* amigaScreenActionListener;
class ScalingMethodActionListener : public gcn::ActionListener
{
public:
void action(const gcn::ActionEvent& actionEvent) override
{
if (actionEvent.getSource() == optAuto)
changed_prefs.scaling_method = -1;
else if (actionEvent.getSource() == optNearest)
changed_prefs.scaling_method = 0;
else if (actionEvent.getSource() == optLinear)
changed_prefs.scaling_method = 1;
}
};
static ScalingMethodActionListener* scalingMethodActionListener;
void InitPanelDisplay(const struct _ConfigCategory& category) void InitPanelDisplay(const struct _ConfigCategory& category)
{ {
@ -111,6 +130,28 @@ void InitPanelDisplay(const struct _ConfigCategory& category)
category.panel->add(grpAmigaScreen); category.panel->add(grpAmigaScreen);
category.panel->add(chkFrameskip, DISTANCE_BORDER, DISTANCE_BORDER + grpAmigaScreen->getHeight() + DISTANCE_NEXT_Y); category.panel->add(chkFrameskip, DISTANCE_BORDER, DISTANCE_BORDER + grpAmigaScreen->getHeight() + DISTANCE_NEXT_Y);
scalingMethodActionListener = new ScalingMethodActionListener();
optAuto = new gcn::UaeRadioButton("Auto", "radioscalingmethodgroup");
optAuto->addActionListener(scalingMethodActionListener);
optNearest = new gcn::UaeRadioButton("Nearest Neighbor (pixelated)", "radioscalingmethodgroup");
optNearest->addActionListener(scalingMethodActionListener);
optLinear = new gcn::UaeRadioButton("Linear (smooth)", "radioscalingmethodgroup");
optLinear->addActionListener(scalingMethodActionListener);
grpScalingMethod = new gcn::Window("Scaling method");
grpScalingMethod->setPosition(DISTANCE_BORDER, DISTANCE_BORDER + grpAmigaScreen->getHeight() + DISTANCE_NEXT_Y);
grpScalingMethod->add(optAuto, 5, 10);
grpScalingMethod->add(optNearest, 5, 40);
grpScalingMethod->add(optLinear, 5, 70);
grpScalingMethod->setMovable(false);
grpScalingMethod->setSize(260, optLinear->getY() + optLinear->getHeight() + 30);
grpScalingMethod->setBaseColor(gui_baseCol);
category.panel->add(grpScalingMethod);
RefreshPanelDisplay(); RefreshPanelDisplay();
} }
@ -126,6 +167,12 @@ void ExitPanelDisplay()
delete grpAmigaScreen; delete grpAmigaScreen;
delete chkFrameskip; delete chkFrameskip;
delete amigaScreenActionListener; delete amigaScreenActionListener;
delete optAuto;
delete optNearest;
delete optLinear;
delete grpScalingMethod;
delete scalingMethodActionListener;
} }
@ -157,4 +204,11 @@ void RefreshPanelDisplay()
} }
chkFrameskip->setSelected(changed_prefs.gfx_framerate); chkFrameskip->setSelected(changed_prefs.gfx_framerate);
if (changed_prefs.scaling_method == -1)
optAuto->setSelected(true);
else if (changed_prefs.scaling_method == 0)
optNearest->setSelected(true);
else if (changed_prefs.scaling_method == 1)
optLinear->setSelected(true);
} }