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

Successful test of using saved QPalette color settings.

This commit is contained in:
mjbudd77 2021-03-07 13:28:44 -05:00
parent 9642be0db1
commit b1c0c4447f
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/drivers/Qt/GuiConf.cpp
View File

@ -43,6 +43,7 @@
static int writeQPaletteToFile( const char *path, QPalette *pal ); static int writeQPaletteToFile( const char *path, QPalette *pal );
static int readQPaletteFromFile( const char *path, QPalette *pal ); static int readQPaletteFromFile( const char *path, QPalette *pal );
static GuiPaletteEditDialog_t *editDialog = NULL;
//---------------------------------------------------- //----------------------------------------------------
GuiConfDialog_t::GuiConfDialog_t(QWidget *parent) GuiConfDialog_t::GuiConfDialog_t(QWidget *parent)
: QDialog(parent) : QDialog(parent)
@ -514,9 +515,13 @@ void GuiConfDialog_t::openQPal(void)
//---------------------------------------------------- //----------------------------------------------------
void GuiConfDialog_t::openQPalette(void) void GuiConfDialog_t::openQPalette(void)
{ {
GuiPaletteEditDialog_t *dialog = new GuiPaletteEditDialog_t(this); if ( editDialog )
{
return;
}
editDialog = new GuiPaletteEditDialog_t(this);
dialog->show(); editDialog->show();
} }
//---------------------------------------------------- //----------------------------------------------------
void GuiConfDialog_t::openTestWindow(void) void GuiConfDialog_t::openTestWindow(void)
@ -593,6 +598,14 @@ void fceuStyle::polish(QPalette &palette)
//basePtr->polish(palette); //basePtr->polish(palette);
//QStyle::polish(palette); //QStyle::polish(palette);
// If the edit dialog is open, don't over write the palette
if ( editDialog )
{
return;
}
palette = standardPalette();
if ( !useCustom ) if ( !useCustom )
{ {
return; return;
@ -843,7 +856,7 @@ static int readQPaletteFromFile( const char *path, QPalette *pal )
} }
while ( fgets( line, sizeof(line), fp ) != 0 ) while ( fgets( line, sizeof(line), fp ) != 0 )
{ {
printf("%s", line ); //printf("%s", line );
i=0; i=0;
@ -1060,7 +1073,10 @@ GuiPaletteEditDialog_t::GuiPaletteEditDialog_t(QWidget *parent)
//---------------------------------------------------- //----------------------------------------------------
GuiPaletteEditDialog_t::~GuiPaletteEditDialog_t(void) GuiPaletteEditDialog_t::~GuiPaletteEditDialog_t(void)
{ {
if ( editDialog == this )
{
editDialog = NULL;
}
} }
//---------------------------------------------------- //----------------------------------------------------
void GuiPaletteEditDialog_t::closeEvent(QCloseEvent *event) void GuiPaletteEditDialog_t::closeEvent(QCloseEvent *event)