ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed zoom settings via hotkey (made persistent again)

This commit is contained in:
thrust26 2018-02-02 22:51:22 +01:00
parent 9d72ae2c4e
commit f4db8e4816
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emucore/FrameBuffer.cxx
View File

@ -150,7 +150,6 @@ bool FrameBuffer::initialize()
FBSurface::setPalette(myPalette); FBSurface::setPalette(myPalette);
myGrabMouse = myOSystem.settings().getBool("grabmouse"); myGrabMouse = myOSystem.settings().getBool("grabmouse");
myZoomMode = myOSystem.settings().getInt("tia.zoom");
// Create a TIA surface; we need it for rendering TIA images // Create a TIA surface; we need it for rendering TIA images
myTIASurface = make_unique<TIASurface>(myOSystem); myTIASurface = make_unique<TIASurface>(myOSystem);
@ -652,7 +651,7 @@ bool FrameBuffer::changeWindowedVidMode(int direction)
resetSurfaces(); resetSurfaces();
showMessage(mode.description); showMessage(mode.description);
myZoomMode = mode.zoom; myOSystem.settings().setValue("tia.zoom", mode.zoom);
return true; return true;
} }
#endif #endif
@ -811,17 +810,11 @@ const VideoMode& FrameBuffer::getSavedVidMode(bool fullscreen)
if(state == EventHandlerState::DEBUGGER || state == EventHandlerState::LAUNCHER) if(state == EventHandlerState::DEBUGGER || state == EventHandlerState::LAUNCHER)
myCurrentModeList->setZoom(1); myCurrentModeList->setZoom(1);
else else
myCurrentModeList->setZoom(myZoomMode); myCurrentModeList->setZoom(myOSystem.settings().getInt("tia.zoom"));
return myCurrentModeList->current(); return myCurrentModeList->current();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBuffer::setZoomMode(uInt32 mode)
{
myZoomMode = mode;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// //
// VideoMode implementation // VideoMode implementation

8
src/emucore/FrameBuffer.hxx
View File

@ -192,11 +192,6 @@ class FrameBuffer
*/ */
const VariantList& supportedTIAZoomLevels() const { return myTIAZoomLevels; } const VariantList& supportedTIAZoomLevels() const { return myTIAZoomLevels; }
/*
Set the current zoom mode.
*/
void setZoomMode(uInt32 mode);
/** /**
Get the font object(s) of the framebuffer Get the font object(s) of the framebuffer
*/ */
@ -528,9 +523,6 @@ class FrameBuffer
// Names of the TIA zoom levels that can be used for this framebuffer // Names of the TIA zoom levels that can be used for this framebuffer
VariantList myTIAZoomLevels; VariantList myTIAZoomLevels;
// curently selected zoom mode
uInt32 myZoomMode;
// Holds a reference to all the surfaces that have been created // Holds a reference to all the surfaces that have been created
vector<shared_ptr<FBSurface>> mySurfaceList; vector<shared_ptr<FBSurface>> mySurfaceList;

1
src/gui/VideoDialog.cxx
View File

@ -410,7 +410,6 @@ void VideoDialog::saveConfig()
// TIA Filter // TIA Filter
instance().settings().setValue("tia.zoom", instance().settings().setValue("tia.zoom",
myTIAZoom->getSelectedTag().toString()); myTIAZoom->getSelectedTag().toString());
instance().frameBuffer().setZoomMode(instance().settings().getInt("tia.zoom"));
// TIA Palette // TIA Palette
instance().settings().setValue("palette", instance().settings().setValue("palette",