Merge pull request #1252 from manongjohn/fix_startup_project_loading_macos
Fix wrong raster project palette
This commit is contained in:
commit
ad1dd82e68
|
@ -239,17 +239,6 @@ SymmetryTool::SymmetryTool()
|
|||
m_color.setId("Color");
|
||||
m_useLineSymmetry.setId("UseLineSymmetry");
|
||||
m_preset.setId("SymmetryPreset");
|
||||
|
||||
std::wstring wpreset =
|
||||
QString::fromStdString(SymmetryPreset.getValue()).toStdWString();
|
||||
if (wpreset != CUSTOM_WSTR) {
|
||||
initPresets();
|
||||
if (!m_preset.isValue(wpreset)) wpreset = CUSTOM_WSTR;
|
||||
m_preset.setValue(wpreset);
|
||||
SymmetryPreset = m_preset.getValueAsString();
|
||||
loadPreset();
|
||||
} else
|
||||
loadLastSymmetry();
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------
|
||||
|
@ -468,6 +457,21 @@ void SymmetryTool::loadLastSymmetry() {
|
|||
|
||||
//----------------------------------------------------------------------------------------------
|
||||
|
||||
void SymmetryTool::loadTool() {
|
||||
std::wstring wpreset =
|
||||
QString::fromStdString(SymmetryPreset.getValue()).toStdWString();
|
||||
if (wpreset != CUSTOM_WSTR) {
|
||||
initPresets();
|
||||
if (!m_preset.isValue(wpreset)) wpreset = CUSTOM_WSTR;
|
||||
m_preset.setValue(wpreset);
|
||||
SymmetryPreset = m_preset.getValueAsString();
|
||||
loadPreset();
|
||||
} else
|
||||
loadLastSymmetry();
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------
|
||||
|
||||
void SymmetryTool::draw(SceneViewer *viewer) {
|
||||
TRectD cameraRect = getApplication()
|
||||
->getCurrentScene()
|
||||
|
|
|
@ -269,6 +269,8 @@ public:
|
|||
void removePreset();
|
||||
void loadLastSymmetry();
|
||||
|
||||
void loadTool() override;
|
||||
|
||||
protected:
|
||||
TPropertyGroup m_prop;
|
||||
std::vector<SymmetryToolOptionBox *> m_toolOptionsBox;
|
||||
|
|
|
@ -1949,6 +1949,9 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,
|
|||
}
|
||||
if (sceneProject && !sceneProject->isCurrent()) {
|
||||
pm->setCurrentProjectPath(sceneProject->getProjectPath());
|
||||
// Clear existing raster palette so it forces a reloads of the new project's
|
||||
// raster palette when loading scene
|
||||
FullColorPalette::instance()->clear();
|
||||
// QString currentProjectName = QString::fromStdWString(
|
||||
// pm->getCurrentProject()->getName().getWideString());
|
||||
// QString sceneProjectName =
|
||||
|
|
|
@ -761,6 +761,15 @@ int main(int argc, char *argv[]) {
|
|||
TTool::getTool(T_PerspectiveGrid, TTool::VectorImage);
|
||||
if (perspectiveTool) perspectiveTool->loadTool();
|
||||
|
||||
// Symmetry tool -
|
||||
splash.showMessage(offsetStr + QObject::tr("Loading Symmetry Guide..."),
|
||||
Qt::AlignRight | Qt::AlignBottom, Qt::black);
|
||||
a.processEvents();
|
||||
|
||||
TTool *symmetryTool =
|
||||
TTool::getTool(T_Symmetry, TTool::VectorImage);
|
||||
if (symmetryTool) symmetryTool->loadTool();
|
||||
|
||||
w.setWindowTitle(QString::fromStdString(TEnv::getApplicationFullName()));
|
||||
if (TEnv::getIsPortable()) {
|
||||
splash.showMessage(offsetStr + QObject::tr("Starting Tahoma2D..."),
|
||||
|
|
Loading…
Reference in a new issue