From 6b26535659f221920af85b6dd47a8e5ae21ec547 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 30 Sep 2016 13:57:16 +0200
Subject: [PATCH] Set cursors properly on render container, make status bar a
 flowlayout

---
 qrenderdoc/Widgets/CustomPaintWidget.cpp |  1 +
 qrenderdoc/Windows/TextureViewer.cpp     | 24 ++++++++++++++++----
 qrenderdoc/Windows/TextureViewer.ui      | 28 ++++++++++--------------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/qrenderdoc/Widgets/CustomPaintWidget.cpp b/qrenderdoc/Widgets/CustomPaintWidget.cpp
index bd4e2ea1e..7a9681378 100644
--- a/qrenderdoc/Widgets/CustomPaintWidget.cpp
+++ b/qrenderdoc/Widgets/CustomPaintWidget.cpp
@@ -6,6 +6,7 @@ CustomPaintWidget::CustomPaintWidget(QWidget *parent) : QWidget(parent)
 {
   m_Output = NULL;
   setAttribute(Qt::WA_PaintOnScreen);
+  setMouseTracking(true);
 }
 
 CustomPaintWidget::~CustomPaintWidget()
diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp
index 03c48d0fa..be465791d 100644
--- a/qrenderdoc/Windows/TextureViewer.cpp
+++ b/qrenderdoc/Windows/TextureViewer.cpp
@@ -136,6 +136,22 @@ TextureViewer::TextureViewer(Core *core, QWidget *parent)
   Ui_TextureViewer *u = ui;
   u->pixelcontextgrid->setAlignment(u->pushButton, Qt::AlignCenter);
   u->pixelcontextgrid->setAlignment(u->pushButton_2, Qt::AlignCenter);
+
+  QWidget *statusflowWidget = new QWidget(this);
+
+  FlowLayout *statusflow = new FlowLayout(statusflowWidget, 0, 3, 0);
+
+  statusflowWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+  ui->statusbar->removeWidget(ui->texStatusDim);
+  ui->statusbar->removeWidget(ui->pickSwatch);
+  ui->statusbar->removeWidget(ui->statusText);
+
+  statusflow->addWidget(ui->texStatusDim);
+  statusflow->addWidget(ui->pickSwatch);
+  statusflow->addWidget(ui->statusText);
+
+  ui->statusbar->addWidget(statusflowWidget);
 }
 
 TextureViewer::~TextureViewer()
@@ -387,7 +403,7 @@ void TextureViewer::on_render_mousemove(QMouseEvent *e)
     {
       if(e->buttons() & Qt::RightButton)
       {
-        // ui->render->setCursor(cross);
+        ui->render->setCursor(QCursor(Qt::CrossCursor));
 
         m_PickedPoint = m_CurHoverPixel;
 
@@ -423,12 +439,12 @@ void TextureViewer::on_render_mousemove(QMouseEvent *e)
         m_DragStartScroll.Y + (curpos.Y - m_DragStartPos.Y));
     }*/
 
-    // ui->render->setCursor(move2D);
+    ui->render->setCursor(QCursor(Qt::SizeAllCursor));
   }
 
   if(e->buttons() == Qt::NoButton)
   {
-    // ui->render->setCursor(default);
+    ui->render->setCursor(QCursor(Qt::ArrowCursor));
   }
 
   UI_UpdateStatusText();
@@ -534,7 +550,7 @@ void TextureViewer::OnEventSelected(uint32_t eventID)
     d.FlipY = false;
     d.rangemin = 0.0f;
     d.rangemax = 1.0f;
-    d.scale = -1.0f;
+    d.scale = 1.0f;
     d.offx = 0.0f;
     d.offy = 0.0f;
     d.sliceFace = 0;
diff --git a/qrenderdoc/Windows/TextureViewer.ui b/qrenderdoc/Windows/TextureViewer.ui
index 9d0255028..a2e8f01fe 100644
--- a/qrenderdoc/Windows/TextureViewer.ui
+++ b/qrenderdoc/Windows/TextureViewer.ui
@@ -768,6 +768,18 @@
      <height>241</height>
     </rect>
    </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>100</width>
+     <height>100</height>
+    </size>
+   </property>
    <layout class="QVBoxLayout" name="verticalLayout">
     <property name="spacing">
      <number>0</number>
@@ -797,9 +809,6 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="cursor">
-         <cursorShape>CrossCursor</cursorShape>
-        </property>
         <property name="styleSheet">
          <string notr="true"/>
         </property>
@@ -881,19 +890,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </item>
    </layout>