Merge remote-tracking branch 'origin/master'

Fragment.glsl

@@ -6,8 +6,8 @@ uniform int iterationCount;
 in vec2 complexPos;
 
 vec3 getColor(in float value){
-    vec3 red = vec3(0.5, 0, 0);
+    vec3 red = vec3(1, 0, 0);
-    vec3 blue = vec3(0, 0, 0.5);
+    vec3 blue = vec3(0, 0, 1);
     return value * red + (1 - value) * blue;
 }
 

src/MainWindow.cpp

@@ -13,7 +13,8 @@ void MainWindow::buildUI() {
 
 	auto iterationsCaption = new QLabel("Iteration count: ");
 	auto iterationsLabel = new QLabel;
-	//iterationsLabel->setAlignment(Qt::AlignRight);
+	iterationsLabel->setFixedWidth(50);
+	iterationsLabel->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
 	auto iterationsSlider = new QSlider(Qt::Horizontal);
 	iterationsSlider->setRange(5, 300);
 	connect(