From 19c8084b64c9c2735ed01fdb8fb52a7b29226660 Mon Sep 17 00:00:00 2001 From: stojce Date: Tue, 10 Sep 2013 00:38:43 +0200 Subject: [PATCH] dynamic height --- .gitignore | 1 + interface/src/InfoView.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9dc509bc19..b90059c479 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ CMakeScripts/ cmake_install.cmake build/ Makefile +*.user # Xcode *.xcodeproj diff --git a/interface/src/InfoView.cpp b/interface/src/InfoView.cpp index 00aaadea86..8789bf27c8 100644 --- a/interface/src/InfoView.cpp +++ b/interface/src/InfoView.cpp @@ -14,8 +14,7 @@ #include #include -#define VIEW_FIXED_WIDTH 808 -#define SETTINGS_KEY_VERSION "info-version" +#define SETTINGS_VERSION_KEY "info-version" InfoView::InfoView() { @@ -41,7 +40,7 @@ void InfoView::loaded(bool ok) { QSettings* settings = Application::getInstance()->getSettings(); - QString lastVersion = settings->value(SETTINGS_KEY_VERSION).toString(); + QString lastVersion = settings->value(SETTINGS_VERSION_KEY).toString(); QWebFrame* mainFrame = page()->mainFrame(); @@ -50,11 +49,15 @@ void InfoView::loaded(bool ok) if (lastVersion == QString::null || version == QString::null || lastVersion != version) { if (version != QString::null) { - settings->setValue(SETTINGS_KEY_VERSION, version); + settings->setValue(SETTINGS_VERSION_KEY, version); } QDesktopWidget* desktop = Application::getInstance()->desktop(); - resize(VIEW_FIXED_WIDTH, desktop->height() * 0.8); + int height = mainFrame->contentsSize().height() > desktop->height() ? + desktop->height() * 0.9 : + mainFrame->contentsSize().height(); + + resize(mainFrame->contentsSize().width(), height); move(desktop->screen()->rect().center() - rect().center()); setWindowTitle(title()); show();