From 436f7fb0cb5f99d0761d96552a57b83232d6e928 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 1 Jul 2008 17:08:34 -0700 Subject: [PATCH] Fix #842 --- src/calibre/gui2/__init__.py | 9 +++++++++ src/calibre/gui2/main.py | 6 ++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 91ae9f0d57..cfa50cdd15 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -20,11 +20,20 @@ if iswindows: import warnings warnings.simplefilter('ignore', DeprecationWarning) +def available_heights(): + desktop = QCoreApplication.instance().desktop() + return map(lambda x: x.height(), map(desktop.availableGeometry, range(desktop.numScreens()))) def available_height(): desktop = QCoreApplication.instance().desktop() return desktop.availableGeometry().height() +def max_available_height(): + return max(available_heights()) + +def min_available_height(): + return min(available_heights()) + def available_width(): desktop = QCoreApplication.instance().desktop() return desktop.availableGeometry().width() diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 01a7056d88..9ee23a471e 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -20,7 +20,7 @@ from calibre.gui2 import APP_UID, warning_dialog, choose_files, error_dialog, \ initialize_file_icon_provider, question_dialog,\ pixmap_to_data, choose_dir, ORG_NAME, \ set_sidebar_directories, \ - SingleApplication, Application, available_height + SingleApplication, Application, available_height, max_available_height from calibre.gui2.cover_flow import CoverFlow, DatabaseImages from calibre.library.database import LibraryDatabase from calibre.gui2.update import CheckForUpdates @@ -46,8 +46,6 @@ from calibre.ebooks.metadata import MetaInformation from calibre.ebooks import BOOK_EXTENSIONS from calibre.ebooks.lrf import preferred_source_formats as LRF_PREFERRED_SOURCE_FORMATS - - class Main(MainWindow, Ui_MainWindow): def set_default_thumbnail(self, height): @@ -233,7 +231,7 @@ class Main(MainWindow, Ui_MainWindow): self.status_bar.cover_flow_button.disable(pictureflowerror) - self.setMaximumHeight(available_height()) + self.setMaximumHeight(max_available_height()) ####################### Setup device detection ######################## self.detector = DeviceDetector(sleep_time=2000)