mirror of
https://github.com/arsenetar/dupeguru.git
synced 2026-01-22 06:37:17 +00:00
Merge branch 'dockable_windows' into details_dialog_improvements_dev
This commit is contained in:
@@ -26,8 +26,7 @@ class DetailsDialog(DetailsDialogBase):
|
||||
self.setWindowTitle(tr("Details"))
|
||||
self.resize(502, 502)
|
||||
self.setMinimumSize(QSize(250, 250))
|
||||
self.splitter = QSplitter(Qt.Vertical, self)
|
||||
self.setCentralWidget(self.splitter)
|
||||
self.splitter = QSplitter(Qt.Vertical)
|
||||
self.topFrame = QFrame()
|
||||
self.topFrame.setFrameShape(QFrame.StyledPanel)
|
||||
self.horizontalLayout = QGridLayout()
|
||||
@@ -74,6 +73,8 @@ class DetailsDialog(DetailsDialogBase):
|
||||
# Late population needed here for connections to the toolbar
|
||||
self.vController.setupViewers(
|
||||
self.selectedImageViewer, self.referenceImageViewer)
|
||||
# self.setCentralWidget(self.splitter) # only as QMainWindow
|
||||
self.setWidget(self.splitter) # only as QDockWidget
|
||||
|
||||
def _update(self):
|
||||
if self.vController is None: # Not yet constructed!
|
||||
@@ -110,15 +111,17 @@ class DetailsDialog(DetailsDialogBase):
|
||||
self._update()
|
||||
|
||||
def ensure_same_sizes(self):
|
||||
# HACK referenceViewer might be 1 pixel shorter in width
|
||||
# HACK This ensures same size while shrinking.
|
||||
# ReferenceViewer might be 1 pixel shorter in width
|
||||
# due to the toolbar in the middle keeping the same width,
|
||||
# so resizing in the GridLayout's engine leads to not enough space
|
||||
# left for the panel on the right.
|
||||
# This ensures same size while shrinking at least:
|
||||
self.horizontalLayout.setColumnMinimumWidth(
|
||||
0, self.selectedImageViewer.size().width())
|
||||
self.horizontalLayout.setColumnMinimumWidth(
|
||||
2, self.selectedImageViewer.size().width())
|
||||
# This work as a QMainWindow, but doesn't work as a QDockWidget:
|
||||
# resize can only grow. Might need some custom sizeHint somewhere...
|
||||
# self.horizontalLayout.setColumnMinimumWidth(
|
||||
# 0, self.selectedImageViewer.size().width())
|
||||
# self.horizontalLayout.setColumnMinimumWidth(
|
||||
# 2, self.selectedImageViewer.size().width())
|
||||
|
||||
# This works when expanding but it's ugly:
|
||||
if self.selectedImageViewer.size().width() > self.referenceImageViewer.size().width():
|
||||
|
||||
Reference in New Issue
Block a user