mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 13:09:01 +08:00
46dda5372b
* Switch stuff to Qt6 * give opencv4 the correct deps * add Qt5Compat to find_dependency * refine vtk deps and promote targets to global * fix dep * ci is probably faster than my desktop pc building. * remove invalid patch part * add qt6 patch * second patch * make openimageio ignore qt5 * [skip actions] qt6 part 3 * vtk qt6 patch * try openimageio again * move gl include * fix patch * does it work now? * remove qualified name * more qt6 fixes * more patches * update and fix rtabmap * gles feature in qtbase needs to be disabled for vtk since vtk assumes desktop opengl * remove patch add error if qtbase was build with gles2 * disable also second patch * fix theia * paraview consolidate patches * fix case issue * fix missing , * add more qt6 changes * remove unnecessary patches * bump port version * remove comments from vtk * add platform features for tools. * fix format * bump ports * another one to bump * v db Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
diff --git a/src/iv/imageviewer.cpp b/src/iv/imageviewer.cpp
|
|
index 79839dd5a..f49da67c0 100644
|
|
--- a/src/iv/imageviewer.cpp
|
|
+++ b/src/iv/imageviewer.cpp
|
|
@@ -14,7 +14,6 @@
|
|
|
|
#include <QApplication>
|
|
#include <QComboBox>
|
|
-#include <QDesktopWidget>
|
|
#include <QFileDialog>
|
|
#include <QKeyEvent>
|
|
#include <QLabel>
|
|
@@ -1951,8 +1951,8 @@ ImageViewer::fitWindowToImage(bool zoomok, bool minsize)
|
|
}
|
|
|
|
if (!m_fullscreen) {
|
|
- QDesktopWidget* desktop = QApplication::desktop();
|
|
- QRect availgeom = desktop->availableGeometry(this);
|
|
+ auto desktop = this->screen();
|
|
+ QRect availgeom = desktop->availableGeometry();
|
|
int availwidth = availgeom.width() - extraw - 20;
|
|
int availheight = availgeom.height() - extrah - menuBar()->height()
|
|
- 20;
|
|
diff --git a/src/iv/ivgl.cpp b/src/iv/ivgl.cpp
|
|
index 2551d02ae..890bb4d92 100644
|
|
--- a/src/iv/ivgl.cpp
|
|
+++ b/src/iv/ivgl.cpp
|
|
@@ -11,6 +11,8 @@
|
|
#include <QLabel>
|
|
#include <QMouseEvent>
|
|
#include <QProgressBar>
|
|
+#include <QPainter>
|
|
+#include <QPen>
|
|
|
|
#include "ivutils.h"
|
|
#include <OpenImageIO/strutil.h>
|