mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-11-04 02:00:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged in mmastriani/fractorium_michel (pull request #49)

Browse Source 
Added PaletteFilenameCombo sort
This commit is contained in:
Michel Mastriani
2020-04-19 17:06:59 +00:00
committed by Matt Feemster
parent f54325dfd2 17c6f29524
commit 5146fc5dd2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Builds/QtCreator/defaults.pri
View File

@ -217,8 +217,8 @@ win32 {
macx {
QMAKE_MAC_SDK = macosx10.14
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
QMAKE_CXXFLAGS += -mmacosx-version-min=10.9 -arch x86_64
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
QMAKE_CXXFLAGS += -mmacosx-version-min=10.10 -arch x86_64
QMAKE_CXXFLAGS += -stdlib=libc++
}

1
Source/Fractorium/FractoriumPalette.cpp
View File

@ -85,6 +85,7 @@ size_t FractoriumEmberController<T>::InitPaletteList(const QString& s)
}
}
m_Fractorium->ui.PaletteFilenameCombo->model()->sort(0);
return m_PaletteList->Size();
}

2
Source/Fractorium/PaletteEditor/PaletteEditor.cpp
View File

@ -58,6 +58,8 @@ PaletteEditor::PaletteEditor(QWidget* p) :
ui->PaletteFilenameCombo->addItem(info.fileName());
}
ui->PaletteFilenameCombo->model()->sort(0);
if (ui->PaletteFilenameCombo->count() > 0)
m_CurrentPaletteFilePath = ui->PaletteFilenameCombo->itemText(0).toStdString();
}