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

fixed crash in Audio & Video dialog when opened from debugger

This commit is contained in:
thrust26 2020-06-17 22:42:54 +02:00
parent 9f048706af
commit 1893a8f434
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes.txt
View File

@ -33,6 +33,10 @@
* Fixed some bugs in 3E+ scheme when using non-standard ROM sizes. * Fixed some bugs in 3E+ scheme when using non-standard ROM sizes.
* Fixed custom palette and TV effects adjustable slider rounding issue.
* Fixed crash in Audio & Video dialog when opened from debugger.
* Updated documentation for changes in ROM properties key names. * Updated documentation for changes in ROM properties key names.
* The codebase now compiles under gcc6 again. Future versions will * The codebase now compiles under gcc6 again. Future versions will

29
src/gui/VideoAudioDialog.cxx
View File

@ -1005,24 +1005,21 @@ void VideoAudioDialog::handleCommand(CommandSender* sender, int cmd,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void VideoAudioDialog::addPalette(int x, int y, int w, int h) void VideoAudioDialog::addPalette(int x, int y, int w, int h)
{ {
if(instance().hasConsole()) constexpr int NUM_LUMA = 8;
{ constexpr int NUM_CHROMA = 16;
constexpr int NUM_LUMA = 8; const GUI::Font& ifont = instance().frameBuffer().infoFont();
constexpr int NUM_CHROMA = 16; const int lwidth = ifont.getMaxCharWidth() * 1.5;
const GUI::Font& ifont = instance().frameBuffer().infoFont(); const float COLW = float(w - lwidth) / NUM_LUMA;
const int lwidth = ifont.getMaxCharWidth() * 1.5; const float COLH = float(h) / NUM_CHROMA;
const float COLW = float(w - lwidth) / NUM_LUMA; const int yofs = (COLH - ifont.getFontHeight() + 1) / 2;
const float COLH = float(h) / NUM_CHROMA;
const int yofs = (COLH - ifont.getFontHeight() + 1) / 2;
for(int idx = 0; idx < NUM_CHROMA; ++idx) for(int idx = 0; idx < NUM_CHROMA; ++idx)
{
myColorLbl[idx] = new StaticTextWidget(myTab, ifont, x, y + yofs + idx * COLH, " ");
for(int lum = 0; lum < NUM_LUMA; ++lum)
{ {
myColorLbl[idx] = new StaticTextWidget(myTab, ifont, x, y + yofs + idx * COLH, " "); myColor[idx][lum] = new ColorWidget(myTab, _font, x + lwidth + lum * COLW, y + idx * COLH,
for(int lum = 0; lum < NUM_LUMA; ++lum) COLW + 1, COLH + 1, 0, false);
{
myColor[idx][lum] = new ColorWidget(myTab, _font, x + lwidth + lum * COLW, y + idx * COLH,
COLW + 1, COLH + 1, 0, false);
}
} }
} }
} }