3 files changed, 8 insertions, 7 deletions
diff --git a/plugingui/powerwidget.cc b/plugingui/powerwidget.cc
index 9be0c48..71ad74b 100644
--- a/plugingui/powerwidget.cc
+++ b/plugingui/powerwidget.cc
@@ -31,7 +31,6 @@
 
 #include <notifier.h>
 #include <settings.h>
-#include <powermap.h>
 
 #include <hugin.hpp>
 #include <cmath>
@@ -120,7 +119,7 @@ PowerWidget::Canvas::Canvas(dggui::Widget* parent,
 
 void PowerWidget::Canvas::repaintEvent(dggui::RepaintEvent *repaintEvent)
 {
-	if(width() < 1 || height() < 1)
+	if(width() < 4 || height() < 4)
 	{
 		return;
 	}
diff --git a/plugingui/powerwidget.h b/plugingui/powerwidget.h
index 3a7bb8e..3d09e6b 100644
--- a/plugingui/powerwidget.h
+++ b/plugingui/powerwidget.h
@@ -34,7 +34,7 @@
 #include <dggui/label.h>
 #include <dggui/font.h>
 
-#include <powermap.h>
+#include <curvemap.h>
 
 struct Settings;
 class SettingsNotifier;
@@ -75,7 +75,7 @@ private:
 		virtual void mouseLeaveEvent() override;
 
 	private:
-		Powermap power_map;
+		CurveMap power_map;
 
 		void parameterChangedFloat(float);
 		void parameterChangedBool(bool);
diff --git a/plugingui/resamplingframecontent.cc b/plugingui/resamplingframecontent.cc
index d92dc27..6e631c7 100644
--- a/plugingui/resamplingframecontent.cc
+++ b/plugingui/resamplingframecontent.cc
@@ -30,6 +30,8 @@
 
 #include <translation.h>
 
+#include <algorithm>
+
 namespace GUI
 {
 
@@ -70,9 +72,9 @@ ResamplingframeContent::ResamplingframeContent(dggui::Widget* parent,
 void ResamplingframeContent::resize(std::size_t width, std::size_t height)
 {
 	Widget::resize(width, height);
-	text_field.resize(width - 50, height);
-	quality_knob.move(width - 36, 20);
-	quality_label.move(width - 40, 0);
+	text_field.resize(std::max(width, std::size_t{51}) - 50, height);
+	quality_knob.move(std::max(width, std::size_t{37}) - 36, 20);
+	quality_label.move(std::max(width, std::size_t{41}) - 40, 0);
 }
 
 void ResamplingframeContent::updateContent()