improve "move to area" to preselect current shown area in combobox

ZookaOnGit · ZookaOnGit · commit d73c8f2ae5e3 · 2024-12-13T14:57:06.000+04:00
diff --git a/src/T2DMap.cpp b/src/T2DMap.cpp
@@ -2904,7 +2904,7 @@ void T2DMap::mouseReleaseEvent(QMouseEvent* event)
         //add our actions
         QMapIterator<QString, QStringList> it2(mUserActions);
         auto mapper = new QSignalMapper(popup);
-        
+
         while (it2.hasNext()) {
             it2.next();
             QStringList actionInfo = it2.value();
@@ -4265,6 +4265,8 @@ void T2DMap::slot_setArea()
 
     set_room_area_dialog->show();
     set_room_area_dialog->raise();
+
+    arealist_combobox->setCurrentIndex(mpMap->mpMapper->getCurrentShownAreaIndex());
 }
 
 
diff --git a/src/dlgMapper.cpp b/src/dlgMapper.cpp
@@ -134,6 +134,11 @@ dlgMapper::dlgMapper( QWidget * parent, Host * pH, TMap * pM )
 
 }
 
+int dlgMapper::getCurrentShownAreaIndex()
+{
+    return comboBox_showArea->currentIndex();
+}
+
 void dlgMapper::updateAreaComboBox()
 {
     if (!mpMap) {
diff --git a/src/dlgMapper.h b/src/dlgMapper.h
@@ -53,6 +53,7 @@ class dlgMapper : public QWidget, public Ui::mapper
     // The button is the goto source for this bit of information:
     bool isIn3DMode() const { return pushButton_3D->isDown(); }
     bool isFloatAndDockable() const;
+    int getCurrentShownAreaIndex();
 
 public slots:
     void slot_toggleRoundRooms(const bool);

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,11 @@ dlgMapper::dlgMapper( QWidget * parent, Host * pH, TMap * pM )`
`134`	`134`
`135`	`135`	`}`
`136`	`136`
	`137`	`+int dlgMapper::getCurrentShownAreaIndex()`
	`138`	`+{`
	`139`	`+ return comboBox_showArea->currentIndex();`
	`140`	`+}`
	`141`	`+`
`137`	`142`	`void dlgMapper::updateAreaComboBox()`
`138`	`143`	`{`
`139`	`144`	`if (!mpMap) {`