Add buttons to move macro segments to top / bottom of segment list

src/advanced-scene-switcher.hpp

@@ -102,12 +102,16 @@ public slots:
 	void on_runMacroOnChange_stateChanged(int value);
 	void on_conditionAdd_clicked();
 	void on_conditionRemove_clicked();
+	void on_conditionTop_clicked();
 	void on_conditionUp_clicked();
 	void on_conditionDown_clicked();
+	void on_conditionBottom_clicked();
 	void on_actionAdd_clicked();
 	void on_actionRemove_clicked();
+	void on_actionTop_clicked();
 	void on_actionUp_clicked();
 	void on_actionDown_clicked();
+	void on_actionBottom_clicked();
 	void MacroSelectionChanged(const QItemSelection &,
 				   const QItemSelection &);
 	void UpMacroSegementHotkey();

src/macro-core/macro-action-edit.cpp

@@ -305,6 +305,15 @@ void AdvSceneSwitcher::on_actionRemove_clicked()
 	MacroActionSelectionChanged(-1);
 }
 
+void AdvSceneSwitcher::on_actionTop_clicked()
+{
+	if (currentActionIdx == -1) {
+		return;
+	}
+	MacroActionReorder(0, currentActionIdx);
+	MacroActionSelectionChanged(0);
+}
+
 void AdvSceneSwitcher::on_actionUp_clicked()
 {
 	if (currentActionIdx == -1 || currentActionIdx == 0) {
@@ -323,6 +332,16 @@ void AdvSceneSwitcher::on_actionDown_clicked()
 	MacroActionSelectionChanged(currentActionIdx + 1);
 }
 
+void AdvSceneSwitcher::on_actionBottom_clicked()
+{
+	if (currentActionIdx == -1) {
+		return;
+	}
+	const int newIdx = actionsList->ContentLayout()->count() - 1;
+	MacroActionReorder(newIdx, currentActionIdx);
+	MacroActionSelectionChanged(newIdx);
+}
+
 void AdvSceneSwitcher::SwapActions(Macro *m, int pos1, int pos2)
 {
 	if (pos1 == pos2) {
@@ -402,8 +421,8 @@ void AdvSceneSwitcher::MacroActionReorder(int to, int from)
 		return;
 	}
 
-	if (from < 0 || from > (int)macro->Actions().size() || to < 0 ||
-	    to > (int)macro->Actions().size()) {
+	if (to == from || from < 0 || from > (int)macro->Actions().size() ||
+	    to < 0 || to > (int)macro->Actions().size()) {
 		return;
 	}
 	{

src/macro-core/macro-condition-edit.cpp

@@ -457,6 +457,15 @@ void AdvSceneSwitcher::on_conditionRemove_clicked()
 	MacroConditionSelectionChanged(-1);
 }
 
+void AdvSceneSwitcher::on_conditionTop_clicked()
+{
+	if (currentConditionIdx == -1) {
+		return;
+	}
+	MacroConditionReorder(0, currentConditionIdx);
+	MacroConditionSelectionChanged(0);
+}
+
 void AdvSceneSwitcher::on_conditionUp_clicked()
 {
 	if (currentConditionIdx == -1 || currentConditionIdx == 0) {
@@ -477,6 +486,16 @@ void AdvSceneSwitcher::on_conditionDown_clicked()
 	MacroConditionSelectionChanged(currentConditionIdx + 1);
 }
 
+void AdvSceneSwitcher::on_conditionBottom_clicked()
+{
+	if (currentConditionIdx == -1) {
+		return;
+	}
+	const int newIdx = conditionsList->ContentLayout()->count() - 1;
+	MacroConditionReorder(newIdx, currentConditionIdx);
+	MacroConditionSelectionChanged(newIdx);
+}
+
 void AdvSceneSwitcher::SwapConditions(Macro *m, int pos1, int pos2)
 {
 	if (pos1 == pos2) {
@@ -570,8 +589,8 @@ void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
 		return;
 	}
 
-	if (from < 0 || from > (int)macro->Conditions().size() || to < 0 ||
-	    to > (int)macro->Conditions().size()) {
+	if (to == from || from < 0 || from > (int)macro->Conditions().size() ||
+	    to < 0 || to > (int)macro->Conditions().size()) {
 		return;
 	}
 	{

src/macro-core/macro-tab.cpp

@@ -503,6 +503,16 @@ void AdvSceneSwitcher::SetupMacroTab()
 	ui->macroActionConditionSplitter->setStyleSheet(
 		"QSplitter::handle {background: transparent;}");
 
+	// Set action and condition control icons
+	const std::string pathPrefix =
+		GetDataFilePath("res/images/" + GetThemeTypeName());
+	SetButtonIcon(ui->actionTop, (pathPrefix + "DoubleUp.svg").c_str());
+	SetButtonIcon(ui->actionBottom,
+		      (pathPrefix + "DoubleDown.svg").c_str());
+	SetButtonIcon(ui->conditionTop, (pathPrefix + "DoubleUp.svg").c_str());
+	SetButtonIcon(ui->conditionBottom,
+		      (pathPrefix + "DoubleDown.svg").c_str());
+
 	// Reserve more space for macro edit area than for the macro list
 	ui->macroListMacroEditSplitter->setStretchFactor(0, 1);
 	ui->macroListMacroEditSplitter->setStretchFactor(1, 4);
@@ -844,32 +854,40 @@ void AdvSceneSwitcher::FadeOutActionControls()
 {
 	fade(ui->actionAdd, true);
 	fade(ui->actionRemove, true);
+	fade(ui->actionTop, true);
 	fade(ui->actionUp, true);
 	fade(ui->actionDown, true);
+	fade(ui->actionBottom, true);
 }
 
 void AdvSceneSwitcher::FadeOutConditionControls()
 {
 	fade(ui->conditionAdd, true);
 	fade(ui->conditionRemove, true);
+	fade(ui->conditionTop, true);
 	fade(ui->conditionUp, true);
 	fade(ui->conditionDown, true);
+	fade(ui->conditionBottom, true);
 }
 
 void AdvSceneSwitcher::ResetOpacityActionControls()
 {
 	fade(ui->actionAdd, false);
 	fade(ui->actionRemove, false);
+	fade(ui->actionTop, false);
 	fade(ui->actionUp, false);
 	fade(ui->actionDown, false);
+	fade(ui->actionBottom, false);
 }
 
 void AdvSceneSwitcher::ResetOpacityConditionControls()
 {
 	fade(ui->conditionAdd, false);
 	fade(ui->conditionRemove, false);
+	fade(ui->conditionTop, false);
 	fade(ui->conditionUp, false);
 	fade(ui->conditionDown, false);
+	fade(ui->conditionBottom, false);
 }
 
 void AdvSceneSwitcher::HighlightControls()