mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-27 08:29:26 -05:00
Merge pull request #749 from PhenomRetroShare/Fix_WindowsHeightAtFirstStart
Fix windows height at first start.
This commit is contained in:
commit
ccb632a442
@ -76,11 +76,20 @@ RWindow::restoreWindowState()
|
||||
m_bSaveStateOnClose = true; // now we save the window state on close
|
||||
|
||||
#if QT_VERSION >= 0x040200
|
||||
QByteArray geometry = getSetting("Geometry", QByteArray()).toByteArray();
|
||||
if (geometry.isEmpty())
|
||||
QByteArray geo = getSetting("Geometry", QByteArray()).toByteArray();
|
||||
if (geo.isEmpty())
|
||||
{
|
||||
adjustSize();
|
||||
QRect rect = geometry();
|
||||
int h = fontMetrics().height()*40;
|
||||
if (rect.height()<h)
|
||||
{
|
||||
rect.setHeight(h);
|
||||
setGeometry(rect);
|
||||
}
|
||||
}
|
||||
else
|
||||
restoreGeometry(geometry);
|
||||
restoreGeometry(geo);
|
||||
#else
|
||||
QRect screen = QDesktopWidget().availableGeometry();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user