File 2002-temp.patch of Package spectacle

Overview Repositories Revisions Requests Users Attributes Meta

File 2002-temp.patch of Package spectacle (Revision 55f1658a3d81d2ea71e02b975a26a044)

Currently displaying revision 55f1658a3d81d2ea71e02b975a26a044 , Show latest

diff --git a/src/Gui/ImageView.qml b/src/Gui/ImageView.qml
index 258adcab..27cb1226 100644
--- a/src/Gui/ImageView.qml
+++ b/src/Gui/ImageView.qml
@@ -27,12 +27,15 @@ EmptyPage {
     readonly property real minimumWidth: Math.max(
         header.implicitWidth,
         annotationsToolBar.implicitWidth + separator.implicitWidth + footerLoader.implicitWidth,
-        captureOptionsLoader.implicitHeight + captureOptionsLoader.width
+        captureOptionsLoader.status === Loader.Ready ? captureOptionsLoader.implicitHeight + captureOptionsLoader.width : 0
     )
-    readonly property real minimumHeight: header.implicitHeight
+    readonly property real minimumHeight: {
+        console.log("++++++ minimumHeight", annotationsToolBar.implicitHeight, footerLoader.implicitHeight, captureOptionsLoader.implicitHeight);
+        return header.implicitHeight
         + Math.max(annotationsToolBar.implicitHeight,
                    footerLoader.implicitHeight,
-                   captureOptionsLoader.implicitHeight)
+                   captureOptionsLoader.status === Loader.Ready ? captureOptionsLoader.implicitHeight : 0)
+    }
 
     property var inlineMessageData: {}
     property string inlineMessageSource: ""
@@ -136,7 +139,14 @@ EmptyPage {
             bottom: parent.bottom
             right: parent.right
         }
-        width: Math.max(implicitWidth, Kirigami.Units.gridUnit * 15)
+        // width: Math.max(implicitWidth, Kirigami.Units.gridUnit * 15)
+        width: {
+            let width = Kirigami.Units.gridUnit * 15;
+            if (status === Loader.Ready) {
+                width = Math.max(implicitWidth, width);
+            }
+            return width;
+        }
         sourceComponent: QQC.Page {
 
             leftPadding: Kirigami.Units.mediumSpacing * 2
@@ -168,6 +178,8 @@ EmptyPage {
                     case 1: return "RecordOptions.qml"
                     default: return ""
                 }
+                onStatusChanged: console.log("++++++ captureOptionsLoader contentItem status changed", status)
+                onWidthChanged: console.log("++++++ captureOptionsLoader contentItem width changed", width)
             }
 
             background: Rectangle {
@@ -182,6 +194,9 @@ EmptyPage {
                 }
             }
         }
+        onImplicitHeightChanged: console.log("++++++ onImplicitHeightChanged", implicitHeight)
+        onStatusChanged: console.log("++++++ captureOptionsLoader status changed", status)
+        onWidthChanged: console.log("++++++ captureOptionsLoader width changed", width)
     }
 
     Loader {
@@ -352,4 +367,6 @@ EmptyPage {
             }
         }
     ]
+
+    Component.onCompleted: console.log("++++++ ImageView.onCompleted")
 }
diff --git a/src/Gui/SpectacleWindow.cpp b/src/Gui/SpectacleWindow.cpp
index 7006257d..b8d7a883 100644
--- a/src/Gui/SpectacleWindow.cpp
+++ b/src/Gui/SpectacleWindow.cpp
@@ -57,7 +57,7 @@ SpectacleWindow::SpectacleWindow(QQmlEngine *engine, QWindow *parent)
     setTextRenderType(QQuickWindow::NativeTextRendering);
 
     // set up QML
-    setResizeMode(QQuickView::SizeRootObjectToView);
+    // setResizeMode(QQuickView::SizeRootObjectToView);
     m_context->setContextProperty(u"contextWindow"_s, this);
 
     addShortcut(QKeySequence::Cancel, QKeySequence::Close, QKeySequence::Quit, SpectacleCore::instance(), &SpectacleCore::cancelScreenshot);
diff --git a/src/Gui/ViewerWindow.cpp b/src/Gui/ViewerWindow.cpp
index 2b4b7ec6..9dc279d1 100644
--- a/src/Gui/ViewerWindow.cpp
+++ b/src/Gui/ViewerWindow.cpp
@@ -20,6 +20,9 @@
 #include <QFile>
 #include <QMimeData>
 #include <QShortcut>
+#include <QDebug>
+#include <QResizeEvent>
+#include <QTimer>
 
 using namespace Qt::StringLiterals;
 
@@ -36,8 +39,12 @@ ViewerWindow::ViewerWindow(Mode mode, QQmlEngine *engine, QWindow *parent)
 
     connect(ExportMenu::instance(), &ExportMenu::imageShared, this, &ViewerWindow::showImageSharedMessage);
 
+    m_updateMinimumSizeTimer = new QTimer(this);
+    m_updateMinimumSizeTimer->setSingleShot(true);
+    connect(m_updateMinimumSizeTimer, &QTimer::timeout, this, &ViewerWindow::updateMinimumSize);
+
     // set up QML
-    setResizeMode(QQuickView::SizeRootObjectToView);
+    // setResizeMode(QQuickView::SizeRootObjectToView);
     setMode(mode); // sets source and other stuff based on mode.
     m_oldWindowStates = windowStates();
 
@@ -123,9 +130,13 @@ void ViewerWindow::setMode(ViewerWindow::Mode mode)
         if (!rootItem) {
             return;
         }
-        updateMinimumSize();
-        connect(rootItem, SIGNAL(minimumWidthChanged()), this, SLOT(updateMinimumSize()));
-        connect(rootItem, SIGNAL(minimumHeightChanged()), this, SLOT(updateMinimumSize()));
+        qDebug() << "++++++ setMode(Image)";
+        // updateMinimumSize();
+        m_updateMinimumSizeTimer->start();
+        // connect(rootItem, SIGNAL(minimumWidthChanged()), this, SLOT(updateMinimumSize()));
+        // connect(rootItem, SIGNAL(minimumHeightChanged()), this, SLOT(updateMinimumSize()));
+        connect(rootItem, SIGNAL(minimumWidthChanged()), m_updateMinimumSizeTimer, SLOT(start()));
+        connect(rootItem, SIGNAL(minimumHeightChanged()), m_updateMinimumSizeTimer, SLOT(start()));
     } else if (mode == Video) {
         
     }
@@ -147,15 +158,17 @@ void ViewerWindow::updateMinimumSize()
     if (auto rootItem = rootObject()) {
         const QSize size = {qRound(rootItem->property("minimumWidth").toReal()),
                             qRound(rootItem->property("minimumHeight").toReal())};
+        qDebug() << "++++++ updateMinimumSize" << size.height();
         // Resizing should be automatic, but sometimes a manual resizing is needed
         // to fix window sizing/graphical glitches after a minimum size change.
-        if (size.width() > width()) {
-            setWidth(size.width());
-        }
-        if (size.height() > height()) {
-            setHeight(size.height());
-        }
+        // if (size.width() > width()) {
+        //     setWidth(size.width());
+        // }
+        // if (size.height() > height()) {
+        //     setHeight(size.height());
+        // }
         setMinimumSize(size);
+        resize(size);
     }
 }
 
@@ -309,10 +322,19 @@ bool ViewerWindow::event(QEvent *event)
 void ViewerWindow::resizeEvent(QResizeEvent *event)
 {
     SpectacleWindow::resizeEvent(event);
+    qDebug() << "++++++ resizeEvent" << event->size() << event->spontaneous();
     if (auto rootItem = rootObject()) {
         // sometimes rootObject size doesn't keep up with the window size
         rootItem->setSize(this->size());
     }
 }
 
+void ViewerWindow::showEvent(QShowEvent *event)
+{
+    SpectacleWindow::showEvent(event);
+
+    qDebug() << "++++++ showEvent";
+    resize(minimumSize());
+}
+
 #include "moc_ViewerWindow.cpp"
diff --git a/src/Gui/ViewerWindow.h b/src/Gui/ViewerWindow.h
index 1f4fcc64..672c85fd 100644
--- a/src/Gui/ViewerWindow.h
+++ b/src/Gui/ViewerWindow.h
@@ -47,6 +47,7 @@ public:
 protected:
     bool event(QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
+    void showEvent(QShowEvent *event) override;
 
 private:
     explicit ViewerWindow(Mode mode, QQmlEngine *engine, QWindow *parent = nullptr);
@@ -65,5 +66,6 @@ private:
     QPalette::ColorRole m_backgroundColorRole;
     Qt::WindowStates m_oldWindowStates;
     const Mode m_mode;
+    QTimer *m_updateMinimumSizeTimer;
     static ViewerWindow *s_viewerWindowInstance;
 };

Places

File 2002-temp.patch of Package spectacle (Revision 55f1658a3d81d2ea71e02b975a26a044)

Places