Fix sidebar preview menu Move Up/Down not disabled on first/last page

xournalpp · Dec 5, 2019 · 97eb788 · 97eb788
1 parent f43fa36
commit 97eb788
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/gui/sidebar/previews/page/SidebarPreviewPages.cpp b/src/gui/sidebar/previews/page/SidebarPreviewPages.cpp
@@ -39,7 +39,18 @@ SidebarPreviewPages::SidebarPreviewPages(Control* control, GladeGui* gui, Sideba
 		const gulong signalId = g_signal_connect(entry, "activate", callback, userdata.get());
 		g_object_ref(entry);
 		this->contextMenuSignals.emplace_back(entry, signalId, std::move(userdata));
+
+		if (pair.first == "sidebarPreviewMoveDown")
+		{
+			this->contextMenuMoveDown = entry;
+		}
+		else if (pair.first == "sidebarPreviewMoveUp")
+		{
+			this->contextMenuMoveUp = entry;
+		}
 	}
+	g_assert(this->contextMenuMoveDown != nullptr);
+	g_assert(this->contextMenuMoveUp != nullptr);
 }
 
 SidebarPreviewPages::~SidebarPreviewPages()
@@ -309,6 +320,9 @@ void SidebarPreviewPages::pageSelected(size_t page)
 
 		this->toolbar->setHidden(false);
 		this->toolbar->setButtonEnabled(static_cast<SidebarActions>(actions));
+
+		gtk_widget_set_sensitive(this->contextMenuMoveUp, actions & SIDEBAR_ACTION_MOVE_UP);
+		gtk_widget_set_sensitive(this->contextMenuMoveDown, actions & SIDEBAR_ACTION_MOVE_DOWN);
 	}
 }
 

diff --git a/src/gui/sidebar/previews/page/SidebarPreviewPages.h b/src/gui/sidebar/previews/page/SidebarPreviewPages.h
@@ -70,6 +70,9 @@ class SidebarPreviewPages : public SidebarPreviewBase
 	 */
 	GtkWidget* const contextMenu = nullptr;
 
+	GtkWidget* contextMenuMoveUp = nullptr;
+	GtkWidget* contextMenuMoveDown = nullptr;
+
 	/**
 	 * The data passed to the menu item callbacks.
 	 */