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

Updated Visual Studio project file for ColorWidget move. 

Fixed crash when attempting to enter "Video Settings" from the
ROM launcher; in that case, 'Debug Colors' must be disabled, since
the widgets only take effect in emulation mode.
This commit is contained in:
Stephen Anthony 2017-07-13 21:45:57 -02:30
parent 66e5a07f20
commit 7904f3e900
7 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/OptionsDialog.cxx
View File

@ -116,11 +116,11 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
addCancelWidget(b);
// Now create all the dialogs attached to each menu button
myVideoDialog = make_ptr<VideoDialog>(osystem, parent, font, max_w, max_h);
myVideoDialog = make_ptr<VideoDialog>(osystem, parent, font, max_w, max_h, myIsGlobal);
myAudioDialog = make_ptr<AudioDialog>(osystem, parent, font);
myInputDialog = make_ptr<InputDialog>(osystem, parent, font, max_w, max_h);
myUIDialog = make_ptr<UIDialog>(osystem, parent, font);
mySnapshotDialog = make_ptr<SnapshotDialog>(osystem, parent, font, boss);
mySnapshotDialog = make_ptr<SnapshotDialog>(osystem, parent, font);
myConfigPathDialog = make_ptr<ConfigPathDialog>(osystem, parent, font, boss);
myRomAuditDialog = make_ptr<RomAuditDialog>(osystem, parent, font, max_w, max_h);
myGameInfoDialog = make_ptr<GameInfoDialog>(osystem, parent, font, this);

5
src/gui/SnapshotDialog.cxx
View File

@ -27,9 +27,8 @@
#include "SnapshotDialog.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SnapshotDialog::SnapshotDialog(
OSystem& osystem, DialogContainer& parent,
const GUI::Font& font, GuiObject* boss)
SnapshotDialog::SnapshotDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font)
: Dialog(osystem, parent),
myFont(font)
{

2
src/gui/SnapshotDialog.hxx
View File

@ -35,7 +35,7 @@ class SnapshotDialog : public Dialog
{
public:
SnapshotDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font, GuiObject* boss);
const GUI::Font& font);
virtual ~SnapshotDialog() = default;
private:

9
src/gui/VideoDialog.cxx
View File

@ -37,7 +37,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font, int max_w, int max_h)
const GUI::Font& font, int max_w, int max_h, bool isGlobal)
: Dialog(osystem, parent)
{
const int lineHeight = font.getLineHeight(),
@ -333,6 +333,11 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
myDbgColourSwatch[idx] = new ColorWidget(myTab, font, x, ypos,
uInt32(2*lineHeight), lineHeight);
ypos += lineHeight + 8;
if(isGlobal)
{
myDbgColour[idx]->clearFlags(WIDGET_ENABLED);
myDbgColourSwatch[idx]->clearFlags(WIDGET_ENABLED);
}
};
createDebugColourWidgets(0, "Player 0 ");
@ -676,7 +681,7 @@ void VideoDialog::handleTVJitterChange(bool enable)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void VideoDialog::handleDebugColours(int idx, int color)
{
if(idx < 0 || idx > 5)
if(!instance().hasConsole() || idx < 0 || idx > 5)
return;
static constexpr int dbg_color[2][6] = {

2
src/gui/VideoDialog.hxx
View File

@ -35,7 +35,7 @@ class VideoDialog : public Dialog
{
public:
VideoDialog(OSystem& osystem, DialogContainer& parent, const GUI::Font& font,
int max_w, int max_h);
int max_w, int max_h, bool isGlobal);
virtual ~VideoDialog() = default;
private:

4
src/windows/Stella.vcxproj
View File

@ -327,6 +327,7 @@
<ClCompile Include="..\emucore\tia\TIA.cxx" />
<ClCompile Include="..\emucore\tia\VblankManager.cxx" />
<ClCompile Include="..\emucore\TrakBall.cxx" />
<ClCompile Include="..\gui\ColorWidget.cxx" />
<ClCompile Include="..\gui\FileListWidget.cxx" />
<ClCompile Include="..\gui\JoystickDialog.cxx" />
<ClCompile Include="..\gui\LoggerDialog.cxx" />
@ -400,7 +401,6 @@
<ClCompile Include="..\cheat\RamCheat.cxx" />
<ClCompile Include="..\debugger\gui\AudioWidget.cxx" />
<ClCompile Include="..\debugger\CartDebug.cxx" />
<ClCompile Include="..\debugger\gui\ColorWidget.cxx" />
<ClCompile Include="..\debugger\CpuDebug.cxx" />
<ClCompile Include="..\debugger\gui\CpuWidget.cxx" />
<ClCompile Include="..\debugger\gui\DataGridOpsWidget.cxx" />
@ -609,6 +609,7 @@
<ClInclude Include="..\emucore\tia\TIA.hxx" />
<ClInclude Include="..\emucore\tia\VblankManager.hxx" />
<ClInclude Include="..\emucore\TrakBall.hxx" />
<ClInclude Include="..\gui\ColorWidget.hxx" />
<ClInclude Include="..\gui\ConsoleBFont.hxx" />
<ClInclude Include="..\gui\ConsoleMediumBFont.hxx" />
<ClInclude Include="..\gui\ConsoleMediumFont.hxx" />
@ -695,7 +696,6 @@
<ClInclude Include="..\emucore\TIASnd.hxx" />
<ClInclude Include="..\debugger\gui\AudioWidget.hxx" />
<ClInclude Include="..\debugger\CartDebug.hxx" />
<ClInclude Include="..\debugger\gui\ColorWidget.hxx" />
<ClInclude Include="..\debugger\CpuDebug.hxx" />
<ClInclude Include="..\debugger\gui\CpuWidget.hxx" />
<ClInclude Include="..\debugger\gui\DataGridOpsWidget.hxx" />

12
src/windows/Stella.vcxproj.filters
View File

@ -267,9 +267,6 @@
<ClCompile Include="..\debugger\CartDebug.cxx">
<Filter>Source Files\debugger</Filter>
</ClCompile>
<ClCompile Include="..\debugger\gui\ColorWidget.cxx">
<Filter>Source Files\debugger</Filter>
</ClCompile>
<ClCompile Include="..\debugger\CpuDebug.cxx">
<Filter>Source Files\debugger</Filter>
</ClCompile>
@ -849,6 +846,9 @@
<ClCompile Include="..\emucore\CartDetector.cxx">
<Filter>Source Files\emucore</Filter>
</ClCompile>
<ClCompile Include="..\gui\ColorWidget.cxx">
<Filter>Source Files\gui</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\bspf.hxx">
@ -1079,9 +1079,6 @@
<ClInclude Include="..\debugger\CartDebug.hxx">
<Filter>Header Files\debugger</Filter>
</ClInclude>
<ClInclude Include="..\debugger\gui\ColorWidget.hxx">
<Filter>Header Files\debugger</Filter>
</ClInclude>
<ClInclude Include="..\debugger\CpuDebug.hxx">
<Filter>Header Files\debugger</Filter>
</ClInclude>
@ -1727,6 +1724,9 @@
<ClInclude Include="..\emucore\CartDetector.hxx">
<Filter>Header Files\emucore</Filter>
</ClInclude>
<ClInclude Include="..\gui\ColorWidget.hxx">
<Filter>Header Files\gui</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="stella.ico">