diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-06-29 11:22:28 -0400 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-06-29 11:22:28 -0400 |
| commit | 1d301fca58db2a1ba171a1c3c423a7e32f6a059e (patch) | |
| tree | b4308faa819decdd9fb1648aca78cb1be5eb17a9 /src-qt5/core | |
| parent | Clean up the handling of the frameExtents property quite a bit. (diff) | |
| download | lumina-1d301fca58db2a1ba171a1c3c423a7e32f6a059e.tar.gz lumina-1d301fca58db2a1ba171a1c3c423a7e32f6a059e.tar.bz2 lumina-1d301fca58db2a1ba171a1c3c423a7e32f6a059e.zip | |
Oops - fix how the new/initial frame extents get saved into the structure..
Diffstat (limited to 'src-qt5/core')
| -rw-r--r-- | src-qt5/core/libLumina/NativeWindowSystem.cpp | 1 | ||||
| -rw-r--r-- | src-qt5/core/libLumina/RootSubWindow.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src-qt5/core/libLumina/NativeWindowSystem.cpp b/src-qt5/core/libLumina/NativeWindowSystem.cpp index 791271cc..5f2c8b6e 100644 --- a/src-qt5/core/libLumina/NativeWindowSystem.cpp +++ b/src-qt5/core/libLumina/NativeWindowSystem.cpp @@ -466,6 +466,7 @@ void NativeWindowSystem::UpdateWindowProperties(NativeWindow* win, QList< Native } void NativeWindowSystem::ChangeWindowProperties(NativeWindow* win, QList< NativeWindow::Property > props, QList<QVariant> vals){ + if(props.length() == 0 || vals.length()!=props.length() || win ==0 ){ return; } qDebug() << "Change Window Properties:" << props << vals; if(props.contains(NativeWindow::Title)){ diff --git a/src-qt5/core/libLumina/RootSubWindow.cpp b/src-qt5/core/libLumina/RootSubWindow.cpp index 213e07ca..bbbbf644 100644 --- a/src-qt5/core/libLumina/RootSubWindow.cpp +++ b/src-qt5/core/libLumina/RootSubWindow.cpp @@ -180,6 +180,7 @@ void RootSubWindow::LoadProperties( QList< NativeWindow::Property> list){ QList<int> frame; frame << WIN_BORDER << WIN_BORDER << WIN_BORDER+titleLabel->height() << WIN_BORDER; vals[i] = QVariant::fromValue< QList<int> >(frame); //use this by default WIN->requestProperty(NativeWindow::FrameExtents, QVariant::fromValue< QList<int> >(frame)); //make sure these values get saved permanently + WIN->setProperty(NativeWindow::FrameExtents, QVariant::fromValue< QList<int> >(frame)); } } qDebug() << "Property:" << list[i] << vals[i]; @@ -271,6 +272,7 @@ void RootSubWindow::propertiesChanged(QList<NativeWindow::Property> props, QList qDebug() << "Got Widget Size:" << vals[i].toSize(); //WinWidget->setSizeHint( vals[i].toSize() ); //WinWidget->resize(vals[i].toSize() ); + WinWidget->resize(vals[i].toSize()); this->resize( WIN->geometry().size() ); qDebug() << " - Size after change:" << WinWidget->size() << this->size(); break; |