X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=aa0bf94894f156c303dd094e936cbed8d9704fc7;hp=d07d3316afb3632a5b9e828c122330851d5f9918;hb=8a07bc241694c10678968309bc8ee4e6076df3a3;hpb=97378470ded88af84edaa0f1063d10d834475665

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index d07d3316..aa0bf948 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -44,12 +44,15 @@
 #include "devices/hardwaredevice.hpp"
 #include "dialogs/settings.hpp"
 #include "globalsettings.hpp"
-#include "subwindows/decoder_selector/subwindow.hpp"
 #include "toolbars/mainbar.hpp"
 #include "util.hpp"
 #include "views/trace/view.hpp"
 #include "views/trace/standardbar.hpp"
 
+#ifdef ENABLE_DECODE
+#include "subwindows/decoder_selector/subwindow.hpp"
+#endif
+
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::dynamic_pointer_cast;
@@ -267,8 +270,13 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
 	QString title = "";
 
 	switch (type) {
+#ifdef ENABLE_DECODE
 		case subwindows::SubWindowTypeDecoderSelector:
 			title = tr("Decoder Selector");
+			break;
+#endif
+		default:
+			break;
 	}
 
 	QDockWidget* dock = new QDockWidget(title, main_window);
@@ -279,8 +287,10 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
 	QMainWindow *dock_main = new QMainWindow(dock);
 	dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
 
+#ifdef ENABLE_DECODE
 	if (type == subwindows::SubWindowTypeDecoderSelector)
 		v = make_shared<subwindows::decoder_selector::SubWindow>(session, dock_main);
+#endif
 
 	if (!v)
 		return nullptr;
@@ -303,6 +313,9 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
 	if (v->has_toolbar())
 		dock_main->addToolBar(v->create_toolbar(dock_main));
 
+	if (v->minimum_width() > 0)
+		dock->setMinimumSize(v->minimum_width(), 0);
+
 	return v;
 }
 
@@ -824,6 +837,7 @@ void MainWindow::on_tab_close_requested(int index)
 
 void MainWindow::on_show_decoder_selector(Session *session)
 {
+#ifdef ENABLE_DECODE
 	// Close dock widget if it's already showing and return
 	for (auto entry : sub_windows_) {
 		QDockWidget* dock = entry.first;
@@ -838,6 +852,7 @@ void MainWindow::on_show_decoder_selector(Session *session)
 	for (shared_ptr<Session> s : sessions_)
 		if (s.get() == session)
 			add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
+#endif
 }
 
 void MainWindow::on_sub_window_close_clicked()