From 17c6f29524f6f1592efd4a209eedc2fbc13b93e8 Mon Sep 17 00:00:00 2001 From: Michel Mastriani Date: Sun, 19 Apr 2020 00:29:01 -0300 Subject: [PATCH] Added PaletteFilenameCombo sort --- Builds/QtCreator/defaults.pri | 4 ++-- Source/Fractorium/FractoriumPalette.cpp | 1 + Source/Fractorium/PaletteEditor/PaletteEditor.cpp | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Builds/QtCreator/defaults.pri b/Builds/QtCreator/defaults.pri index ee1e2bf..8399ed4 100644 --- a/Builds/QtCreator/defaults.pri +++ b/Builds/QtCreator/defaults.pri @@ -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++ } diff --git a/Source/Fractorium/FractoriumPalette.cpp b/Source/Fractorium/FractoriumPalette.cpp index 9c0d4d0..fc54d87 100644 --- a/Source/Fractorium/FractoriumPalette.cpp +++ b/Source/Fractorium/FractoriumPalette.cpp @@ -85,6 +85,7 @@ size_t FractoriumEmberController::InitPaletteList(const QString& s) } } + m_Fractorium->ui.PaletteFilenameCombo->model()->sort(0); return m_PaletteList->Size(); } diff --git a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp index fc3f3a1..3032a60 100644 --- a/Source/Fractorium/PaletteEditor/PaletteEditor.cpp +++ b/Source/Fractorium/PaletteEditor/PaletteEditor.cpp @@ -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(); }