MenuOption: fix a bug that wouldn't allow the menu to move around mor…

…e than 9 tools Signed-off-by: Daniel Guramulta <[email protected]>
netdebug · Mar 8, 2018 · ca00c9a · ca00c9a
1 parent fc37e14
commit ca00c9a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 7 deletions.
diff --git a/src/dragzone.cpp b/src/dragzone.cpp
@@ -57,6 +57,16 @@ void DragZone::dropEvent(QDropEvent *event)
 	}
 }
 
+int DragZone::getPosition() const
+{
+	return position;
+}
+
+void DragZone::setPosition(int value)
+{
+	position = value;
+}
+
 bool DragZone::eventFilter(QObject *watched, QEvent *event)
 {
 	if (event->type() == QEvent::DragEnter){

diff --git a/src/dragzone.h b/src/dragzone.h
@@ -22,6 +22,9 @@ class DragZone : public QWidget
 
 	bool eventFilter(QObject *watched, QEvent *event);
 
+	int getPosition() const;
+	void setPosition(int value);
+
 Q_SIGNALS:
 	void requestPositionChange(int, int, bool);
 	void highlightLastSeparator(bool);

diff --git a/src/menuoption.cpp b/src/menuoption.cpp
@@ -28,7 +28,8 @@ MenuOption::MenuOption(QString toolName, QString iconPath,
 	usesCustomBtn(usesCustomBtn),
 	botSep(nullptr),
 	topSep(nullptr),
-	detached(false)
+	detached(false),
+	maxMenuElements(8)
 {
 	ui->setupUi(this);
 	ui->toolBtn->setText(toolName);
@@ -60,7 +61,7 @@ MenuOption::MenuOption(QString toolName, QString iconPath,
 	topSep->setSizePolicy(sp_retainTopSep);
 	topSep->setVisible(false);
 
-	if (position == 8){
+	if (position == maxMenuElements){
 		botSep = new QFrame(this);
 		botSep->setFrameShadow(QFrame::Plain);
 		botSep->setLineWidth(1);
@@ -96,7 +97,7 @@ QPushButton *MenuOption::getToolStopBtn()
 void MenuOption::setPosition(int position)
 {
 	this->position = position;
-	if (position != 8){
+	if (position != maxMenuElements){
 		if (botSep != nullptr){
 			ui->verticalLayout->removeWidget(botSep);
 			delete botSep;
@@ -140,6 +141,9 @@ bool MenuOption::isDetached()
 
 void MenuOption::highlightBotSeparator(bool on)
 {
+	if (!botSep)
+		return;
+
 	botSep->setVisible(on);
 }
 
@@ -221,7 +225,7 @@ void MenuOption::dragMoveEvent(QDragMoveEvent *event)
 		highlightTopSeparator();
 		event->accept();
 	} else if (event->answerRect().intersects(botDragbox) &&
-				this->position == 8){
+				this->position == maxMenuElements){
 			disableSeparatorsHighlight();
 			highlightBotSeparator();
 			event->accept();

diff --git a/src/menuoption.h b/src/menuoption.h
@@ -40,11 +40,16 @@ class MenuOption : public QWidget
 
 	void paintEvent(QPaintEvent *pe);
 	bool eventFilter(QObject *watched, QEvent *event);
+
+	int getMaxMenuElements() const;
+	void setMaxMenuElements(int value);
+
 private:
 
 	bool detached;
 	int position;
 	QString toolName;
+	int maxMenuElements;
 
 	QPoint dragStartPosition;
 

diff --git a/src/tool_launcher.cpp b/src/tool_launcher.cpp
@@ -470,9 +470,23 @@ void ToolLauncher::generateMenu()
 }
 
 void ToolLauncher::insertMenuOptions(){
+
+	if (debugger_enabled) {
+		for (auto &option : toolMenu) {
+			option->setMaxMenuElements(
+						option->getMaxMenuElements() + 1);
+		}
+	}
+
+	int offset = 0;
 	for (int i = 0; i < position.size(); ++i){
-		ui->menuOptionsLayout->insertWidget(i, toolMenu[tools[position[i]]]);
-		toolMenu[tools[position[i]]]->setPosition(i);
+		if (toolMenu[tools[position[i]]]->getName() == "Debugger"
+				&& !debugger_enabled) {
+			offset = 1;
+			continue;
+		}
+		ui->menuOptionsLayout->insertWidget(i - offset, toolMenu[tools[position[i]]]);
+		toolMenu[tools[position[i]]]->setPosition(i - offset);
 		ui->buttonGroup_2->addButton(toolMenu[tools[position[i]]]->getToolBtn());
 	}
 
@@ -484,6 +498,7 @@ void ToolLauncher::insertMenuOptions(){
 		SLOT(highlightLast(bool)));
 
 	toolMenu["Debugger"]->setVisible(debugger_enabled);
+	dragZone->setPosition(ui->menuOptionsLayout->count() - 2);
 }
 
 void ToolLauncher::highlightLast(bool on){
@@ -1362,7 +1377,7 @@ void ToolLauncher::closeEvent(QCloseEvent *event)
 
 void ToolLauncher::swapMenuOptions(int source, int destination, bool dropAfter)
 {
-	int menuSize = ui->menuOptionsLayout->count();
+	int menuSize = toolMenu["Digital IO"]->getMaxMenuElements() + 1;
 
 	QWidget *sourceWidget = ui->menuOptionsLayout->itemAt(source)->widget();
 	if (dropAfter == true){