diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2020-12-16 18:49:11 -0500 |
---|---|---|
committer | Vas Crabb <cuavas@users.noreply.github.com> | 2020-12-17 14:48:54 +1100 |
commit | e635cdf74c1083e1f9a6aef6202d58da04c42fe5 (patch) | |
tree | a41a5869e498a0628c04e48a6fda709584e072c4 /src/osd | |
parent | b9ad748de649c0791bd132ddcc24d177e1eccdad (diff) |
Add "Non-Integer Scaling" and "Keep Aspect" settings to UI video options menu and remove SDL hotkeys for same
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/mac/video.cpp | 15 | ||||
-rw-r--r-- | src/osd/modules/input/input_sdlcommon.cpp | 10 | ||||
-rw-r--r-- | src/osd/sdl/video.cpp | 18 |
3 files changed, 2 insertions, 41 deletions
diff --git a/src/osd/mac/video.cpp b/src/osd/mac/video.cpp index dbbf0324289..4b62493cec6 100644 --- a/src/osd/mac/video.cpp +++ b/src/osd/mac/video.cpp @@ -139,21 +139,6 @@ static void check_osd_inputs(running_machine &machine) } auto window = osd_common_t::s_window_list.front(); - if (machine.ui_input().pressed(IPT_OSD_2)) - { - //FIXME: on a per window basis - video_config.fullstretch = !video_config.fullstretch; - window->target()->set_scale_mode(video_config.fullstretch? SCALE_FRACTIONAL : SCALE_INTEGER); - machine.ui().popup_time(1, "Uneven stretch %s", video_config.fullstretch? "enabled":"disabled"); - } - - if (machine.ui_input().pressed(IPT_OSD_4)) - { - //FIXME: on a per window basis - video_config.keepaspect = !video_config.keepaspect; - window->target()->set_keepaspect(video_config.keepaspect); - machine.ui().popup_time(1, "Keepaspect %s", video_config.keepaspect? "enabled":"disabled"); - } //FIXME: on a per window basis if (machine.ui_input().pressed(IPT_OSD_5)) diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp index 73073ead5ae..1f2606fd973 100644 --- a/src/osd/modules/input/input_sdlcommon.cpp +++ b/src/osd/modules/input/input_sdlcommon.cpp @@ -195,21 +195,11 @@ void sdl_osd_interface::customize_input_type_list(std::vector<input_type_entry> // various dipswitches, and pressing them together with // LCTRL will still press/toggle these dipswitches. - // LCTRL-F3 to toggle fullstretch - case IPT_OSD_2: - entry.configure_osd("TOGGLE_FULLSTRETCH", "Toggle Uneven stretch"); - entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F3, KEYCODE_LCONTROL); - break; // add a Not lcrtl condition to the reset key case IPT_UI_SOFT_RESET: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F3, input_seq::not_code, KEYCODE_LCONTROL, input_seq::not_code, KEYCODE_LSHIFT); break; - // LCTRL-F4 to toggle keep aspect - case IPT_OSD_4: - entry.configure_osd("TOGGLE_KEEP_ASPECT", "Toggle Keepaspect"); - entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F4, KEYCODE_LCONTROL); - break; // add a Not lcrtl condition to the show gfx key case IPT_UI_SHOW_GFX: entry.defseq(SEQ_TYPE_STANDARD).set(KEYCODE_F4, input_seq::not_code, KEYCODE_LCONTROL); diff --git a/src/osd/sdl/video.cpp b/src/osd/sdl/video.cpp index e7af55e56ba..c00d86cd03e 100644 --- a/src/osd/sdl/video.cpp +++ b/src/osd/sdl/video.cpp @@ -140,30 +140,16 @@ static void check_osd_inputs(running_machine &machine) } auto window = osd_common_t::s_window_list.front(); - if (machine.ui_input().pressed(IPT_OSD_2)) - { - //FIXME: on a per window basis - video_config.fullstretch = !video_config.fullstretch; - window->target()->set_scale_mode(video_config.fullstretch? SCALE_FRACTIONAL : SCALE_INTEGER); - machine.ui().popup_time(1, "Uneven stretch %s", video_config.fullstretch? "enabled":"disabled"); - } - if (machine.ui_input().pressed(IPT_OSD_4)) + if (USE_OPENGL) { //FIXME: on a per window basis - video_config.keepaspect = !video_config.keepaspect; - window->target()->set_keepaspect(video_config.keepaspect); - machine.ui().popup_time(1, "Keepaspect %s", video_config.keepaspect? "enabled":"disabled"); - } - - #if (USE_OPENGL) - //FIXME: on a per window basis if (machine.ui_input().pressed(IPT_OSD_5)) { video_config.filter = !video_config.filter; machine.ui().popup_time(1, "Filter %s", video_config.filter? "enabled":"disabled"); } - #endif + } if (machine.ui_input().pressed(IPT_OSD_6)) std::static_pointer_cast<sdl_window_info>(window)->modify_prescale(-1); |