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

made UI theme change immediate

This commit is contained in:
thrust26 2018-08-12 23:01:43 +02:00
parent 1fe5cd2b3f
commit 4bc3373b37
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/emucore/FrameBuffer.cxx
View File

@ -131,14 +131,27 @@ bool FrameBuffer::initialize()
VarList::push_back(myTIAZoomLevels, desc.str(), zoom);
}
// Set palette for GUI (upper area of array, doesn't change during execution)
setUIPalette();
myGrabMouse = myOSystem.settings().getBool("grabmouse");
// Create a TIA surface; we need it for rendering TIA images
myTIASurface = make_unique<TIASurface>(myOSystem);
return true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBuffer::setUIPalette()
{
// Set palette for GUI (upper area of array)
int palID = 0;
if(myOSystem.settings().getString("uipalette") == "classic")
palID = 1;
else if(myOSystem.settings().getString("uipalette") == "light")
palID = 2;
for(uInt32 i = 0, j = 256; i < kNumColors-256; ++i, ++j)
for(uInt32 i = 0, j = 256; i < kNumColors - 256; ++i, ++j)
{
uInt8 r = (ourGUIColors[palID][i] >> 16) & 0xff;
uInt8 g = (ourGUIColors[palID][i] >> 8) & 0xff;
@ -147,13 +160,6 @@ bool FrameBuffer::initialize()
myPalette[j] = mapRGB(r, g, b);
}
FBSurface::setPalette(myPalette);
myGrabMouse = myOSystem.settings().getBool("grabmouse");
// Create a TIA surface; we need it for rendering TIA images
myTIASurface = make_unique<TIASurface>(myOSystem);
return true;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

5
src/emucore/FrameBuffer.hxx
View File

@ -99,6 +99,11 @@ class FrameBuffer
*/
bool initialize();
/**
Set palette for user interface
*/
void setUIPalette();
/**
(Re)creates the framebuffer display. This must be called before any
calls are made to derived methods.

11
src/gui/UIDialog.cxx
View File

@ -74,7 +74,7 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
VarList::push_back(items, "Classic", "classic");
VarList::push_back(items, "Light", "light");
myPalettePopup = new PopUpWidget(myTab, font, xpos, ypos, pwidth, lineHeight,
items, "Theme (*) ", lwidth);
items, "Theme ", lwidth);
wid.push_back(myPalettePopup);
ypos += lineHeight + 4 * 4;
@ -99,14 +99,6 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
myWheelLinesPopup->setTickmarkInterval(3);
wid.push_back(myWheelLinesPopup);
// Add message concerning usage
xpos = HBORDER;
ypos = myTab->getHeight() - 5 - fontHeight - ifont.getFontHeight() - 10;
lwidth = ifont.getStringWidth("(*) Requires application restart");
new StaticTextWidget(myTab, ifont, xpos, ypos, std::min(lwidth, _w-20), fontHeight,
"(*) Requires application restart",
TextAlign::Left);
// Add items for tab 0
addToFocusList(wid, myTab, tabID);
@ -247,6 +239,7 @@ void UIDialog::saveConfig()
// UI palette
instance().settings().setValue("uipalette",
myPalettePopup->getSelectedTag().toString());
instance().frameBuffer().setUIPalette();
// Listwidget quick delay
instance().settings().setValue("listdelay", myListDelayPopup->getValue());