libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed Widget::draw for bordered items to adjust _h; removed unused label param from SliderWidget constructor; cleanup

Browse Source 
svn-id: r11041
This commit is contained in:
Max Horn 2003-11-01 22:21:18 +00:00
parent 2d7eef223e
commit 72699c3d2b
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gui/options.cpp
View File

@ -51,6 +51,7 @@ This just looks like an option dialog, but it doesn't change any actual settings
// - music & graphics driver (but see also the comments on EditGameDialog // - music & graphics driver (but see also the comments on EditGameDialog
// for some techincal difficulties with this) // for some techincal difficulties with this)
// - default volumes (sfx/master/music) // - default volumes (sfx/master/music)
// - aspect ratio, language, platform, subtitles, debug mode/level, cd drive, joystick, multi midi, native mt32
enum { enum {
kMasterVolumeChanged = 'mavc', kMasterVolumeChanged = 'mavc',
@ -85,8 +86,7 @@ GlobalOptionsDialog::GlobalOptionsDialog(NewGui *gui, GameDetector &detector)
// The MIDI mode popup & a label // The MIDI mode popup & a label
StaticTextWidget *foo = new StaticTextWidget(this, 5, 26+1, 100, kLineHeight, "Music driver: ", kTextAlignRight); new StaticTextWidget(this, 5, 26+1, 100, kLineHeight, "Music driver: ", kTextAlignRight);
foo->setEnabled(false);
_midiPopUp = new PopUpWidget(this, 105, 26, 180, kLineHeight); _midiPopUp = new PopUpWidget(this, 105, 26, 180, kLineHeight);
int midiSelected = 0, i = 0;; int midiSelected = 0, i = 0;;
@ -105,26 +105,28 @@ GlobalOptionsDialog::GlobalOptionsDialog(NewGui *gui, GameDetector &detector)
// //
// Sound controllers // Sound controllers
// //
const int yoffset = 40; int yoffset = 48;
new StaticTextWidget(this, 5, yoffset+10, 100, 16, "Master volume: ", kTextAlignRight);
new StaticTextWidget(this, 5, yoffset+26, 100, 16, "Music volume: ", kTextAlignRight);
new StaticTextWidget(this, 5, yoffset+42, 100, 16, "SFX volume: ", kTextAlignRight);
_masterVolumeSlider = new SliderWidget(this, 105, yoffset+8, 85, 12, "Volume1", kMasterVolumeChanged); new StaticTextWidget(this, 5, yoffset+2, 100, 16, "Master volume: ", kTextAlignRight);
_musicVolumeSlider = new SliderWidget(this, 105, yoffset+24, 85, 12, "Volume2", kMusicVolumeChanged); _masterVolumeSlider = new SliderWidget(this, 105, yoffset, 85, 12, kMasterVolumeChanged);
_sfxVolumeSlider = new SliderWidget(this, 105, yoffset+40, 85, 12, "Volume3", kSfxVolumeChanged); _masterVolumeLabel = new StaticTextWidget(this, 200, yoffset+2, 24, 16, "100%", kTextAlignLeft);
_masterVolumeSlider->setMinValue(0); _masterVolumeSlider->setMaxValue(255);
_masterVolumeSlider->setMinValue(0); _masterVolumeSlider->setMaxValue(255);
_musicVolumeSlider->setMinValue(0); _musicVolumeSlider->setMaxValue(255);
_sfxVolumeSlider->setMinValue(0); _sfxVolumeSlider->setMaxValue(255);
_masterVolumeLabel = new StaticTextWidget(this, 200, yoffset+10, 24, 16, "100%", kTextAlignLeft);
_musicVolumeLabel = new StaticTextWidget(this, 200, yoffset+26, 24, 16, "100%", kTextAlignLeft);
_sfxVolumeLabel = new StaticTextWidget(this, 200, yoffset+42, 24, 16, "100%", kTextAlignLeft);
_masterVolumeLabel->setFlags(WIDGET_CLEARBG); _masterVolumeLabel->setFlags(WIDGET_CLEARBG);
yoffset += 16;
new StaticTextWidget(this, 5, yoffset+2, 100, 16, "Music volume: ", kTextAlignRight);
_musicVolumeSlider = new SliderWidget(this, 105, yoffset, 85, 12, kMusicVolumeChanged);
_musicVolumeLabel = new StaticTextWidget(this, 200, yoffset+2, 24, 16, "100%", kTextAlignLeft);
_musicVolumeSlider->setMinValue(0); _musicVolumeSlider->setMaxValue(255);
_musicVolumeLabel->setFlags(WIDGET_CLEARBG); _musicVolumeLabel->setFlags(WIDGET_CLEARBG);
yoffset += 16;
new StaticTextWidget(this, 5, yoffset+2, 100, 16, "SFX volume: ", kTextAlignRight);
_sfxVolumeSlider = new SliderWidget(this, 105, yoffset, 85, 12, kSfxVolumeChanged);
_sfxVolumeLabel = new StaticTextWidget(this, 200, yoffset+2, 24, 16, "100%", kTextAlignLeft);
_sfxVolumeSlider->setMinValue(0); _sfxVolumeSlider->setMaxValue(255);
_sfxVolumeLabel->setFlags(WIDGET_CLEARBG); _sfxVolumeLabel->setFlags(WIDGET_CLEARBG);
yoffset += 16;
#if !( defined(__DC__) || defined(__GP32__) ) #if !( defined(__DC__) || defined(__GP32__) )
@ -165,15 +167,15 @@ void GlobalOptionsDialog::open() {
Dialog::open(); Dialog::open();
_soundVolumeMaster = ConfMan.getInt("master_volume"); _soundVolumeMaster = ConfMan.getInt("master_volume");
_soundVolumeMusic = ConfMan.getInt("music_volume");
_soundVolumeSfx = ConfMan.getInt("sfx_volume");
_masterVolumeSlider->setValue(_soundVolumeMaster); _masterVolumeSlider->setValue(_soundVolumeMaster);
_musicVolumeSlider->setValue(_soundVolumeMusic);
_sfxVolumeSlider->setValue(_soundVolumeSfx);
_masterVolumeLabel->setValue(_soundVolumeMaster); _masterVolumeLabel->setValue(_soundVolumeMaster);
_soundVolumeMusic = ConfMan.getInt("music_volume");
_musicVolumeSlider->setValue(_soundVolumeMusic);
_musicVolumeLabel->setValue(_soundVolumeMusic); _musicVolumeLabel->setValue(_soundVolumeMusic);
_soundVolumeSfx = ConfMan.getInt("sfx_volume");
_sfxVolumeSlider->setValue(_soundVolumeSfx);
_sfxVolumeLabel->setValue(_soundVolumeSfx); _sfxVolumeLabel->setValue(_soundVolumeSfx);
} }

6
gui/widget.cpp
View File

@ -51,6 +51,7 @@ void Widget::draw() {
_x += 4; _x += 4;
_y += 4; _y += 4;
_w -= 8; _w -= 8;
_h -= 8;
} }
// Now perform the actual widget draw // Now perform the actual widget draw
@ -61,6 +62,7 @@ void Widget::draw() {
_x -= 4; _x -= 4;
_y -= 4; _y -= 4;
_w += 8; _w += 8;
_h += 8;
} }
// Flag the draw area as dirty // Flag the draw area as dirty
@ -171,8 +173,8 @@ void CheckboxWidget::drawWidget(bool hilite) {
#pragma mark - #pragma mark -
SliderWidget::SliderWidget(Dialog *boss, int x, int y, int w, int h, const String &label, uint32 cmd, uint8 hotkey) SliderWidget::SliderWidget(Dialog *boss, int x, int y, int w, int h, uint32 cmd, uint8 hotkey)
: ButtonWidget(boss, x, y, w, h, label, cmd, hotkey), : ButtonWidget(boss, x, y, w, h, "", cmd, hotkey),
_value(0), _oldValue(0),_valueMin(0), _valueMax(100), _isDragging(false) { _value(0), _oldValue(0),_valueMin(0), _valueMax(100), _isDragging(false) {
_flags = WIDGET_ENABLED | WIDGET_TRACK_MOUSE | WIDGET_CLEARBG; _flags = WIDGET_ENABLED | WIDGET_TRACK_MOUSE | WIDGET_CLEARBG;
_type = kSliderWidget; _type = kSliderWidget;

2
gui/widget.h
View File

@ -203,7 +203,7 @@ protected:
int _valueMin, _valueMax; int _valueMin, _valueMax;
bool _isDragging; bool _isDragging;
public: public:
SliderWidget(Dialog *boss, int x, int y, int w, int h, const String &label, uint32 cmd = 0, uint8 hotkey = 0); SliderWidget(Dialog *boss, int x, int y, int w, int h, uint32 cmd = 0, uint8 hotkey = 0);
void setValue(int value) { _value = value; } void setValue(int value) { _value = value; }
int getValue() const { return _value; } int getValue() const { return _value; }