Corrected swapping of fractal tabs in Navi

buddhi1980 · Sep 29, 2024 · 442433f · 442433f
1 parent ce39ac6
commit 442433f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/mandelbulber2/qt/dock_fractal.cpp b/mandelbulber2/qt/dock_fractal.cpp
@@ -215,9 +215,11 @@ void cDockFractal::InitializeFractalUi() const
 		}
 		fractalTabs[i]->AssignParameterContainers(params, fractalParams);
 		fractalTabs[i]->Init(i == 0, i);
+		fractalTabs[i]->AssignParentDockFractal(this);
 	}
 
 	static_cast<MyTabBar *>(ui->tabWidget_fractals->tabBar())->setupMoveButtons();
+
 	//}
 	WriteLog("cInterface::InitializeFractalUi(QString &uiFileName) finished", 2);
 }
@@ -227,7 +229,7 @@ void cDockFractal::slotFractalSwap(int swapA, int swapB) const
 	// qDebug() << "swapping " << swapA << " with " << swapB;
 
 	// read all data from ui
-	gMainInterface->SynchronizeInterface(params, fractalParams, qInterface::read);
+	SynchronizeInterfaceFractals(params, fractalParams, qInterface::read);
 
 	// swap formula specific fields in gPar
 	QStringList gParFormulaSpecificFields({"formula", "formula_iterations", "formula_weight",
@@ -264,7 +266,7 @@ void cDockFractal::slotFractalSwap(int swapA, int swapB) const
 	fractalTabs[swapB]->SynchronizeFractal(fractalParams->at(swapA), qInterface::read);
 
 	// write swapped changes to ui
-	gMainInterface->SynchronizeInterface(params, fractalParams, qInterface::write);
+	SynchronizeInterfaceFractals(params, fractalParams, qInterface::write);
 }
 
 void cDockFractal::slotChangedCheckBoxBooleanOperators(bool state) const

diff --git a/mandelbulber2/qt/tab_fractal.cpp b/mandelbulber2/qt/tab_fractal.cpp
@@ -233,8 +233,7 @@ void cTabFractal::slotChangedComboFractal(int indexInComboBox)
 			};
 
 			fractal::enumCPixelAddition cPixelAddition = newFractalList[index]->getCpixelAddition();
-			bool booleanState =
-				gMainInterface->mainWindow->GetWidgetDockFractal()->AreBooleanFractalsEnabled();
+			bool booleanState = parentDockFractal->AreBooleanFractalsEnabled();
 
 			if (cPixelAddition == fractal::cpixelAlreadyHas)
 				CConstantAdditionSetVisible(false);
@@ -277,7 +276,7 @@ void cTabFractal::slotChangedComboFractal(int indexInComboBox)
 		fractalWidget.reset();
 	}
 
-	gMainInterface->mainWindow->GetWidgetDockFractal()->SetTabText(
+	parentDockFractal->SetTabText(
 		tabIndex, QString("#%1: %2").arg(tabIndex + 1).arg(fullFormulaName));
 }
 

diff --git a/mandelbulber2/qt/tab_fractal.h b/mandelbulber2/qt/tab_fractal.h
@@ -50,6 +50,7 @@
 class cAutomatedWidgets;
 class cParameterContainer;
 class cFractalContainer;
+class cDockFractal;
 
 namespace Ui
 {
@@ -63,6 +64,10 @@ class cTabFractal : public QWidget, public cMyWidgetWithParams
 	explicit cTabFractal(QWidget *parent = nullptr);
 	~cTabFractal() override;
 
+	void AssignParentDockFractal(const cDockFractal *dockFractal)
+	{
+		parentDockFractal = dockFractal;
+	};
 	void InitWidgetNames() const;
 	void Init(bool firstTab, int _tabIndex);
 	void FormulaTransformSetVisible(bool visible) const;
@@ -99,6 +104,8 @@ private slots:
 	std::unique_ptr<QWidget> fractalWidget;
 
 	cAutomatedWidgets *automatedWidgets;
+
+	const cDockFractal *parentDockFractal = nullptr;
 };
 
 #endif /* MANDELBULBER2_QT_TAB_FRACTAL_H_ */