Compare commits
4 Commits
pre-commit
...
fix_white_
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f674aa27a9 | ||
|
|
5f78110025 | ||
|
|
ca3c49f32d | ||
|
|
def6a0a6b2 |
@@ -250,8 +250,8 @@ QQmlEngine *Config::qmlEngine() const
|
|||||||
void Config::Private::fixFlags()
|
void Config::Private::fixFlags()
|
||||||
{
|
{
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
if (QOperatingSystemVersion::current().majorVersion() < 10) {
|
if (QOperatingSystemVersion::current().majorVersion() < 8) {
|
||||||
// Aero-snap requires Windows 10
|
// Untested on Windows 7. Windows 8 doesn't have aerosnap but at least it can get native resizing
|
||||||
m_flags = m_flags & ~Flag_AeroSnapWithClientDecos;
|
m_flags = m_flags & ~Flag_AeroSnapWithClientDecos;
|
||||||
} else {
|
} else {
|
||||||
// Unconditional now
|
// Unconditional now
|
||||||
|
|||||||
@@ -154,7 +154,6 @@ void DockWidgetBase::setWidget(QWidgetOrQuick *w)
|
|||||||
setSizePolicy(w->sizePolicy());
|
setSizePolicy(w->sizePolicy());
|
||||||
|
|
||||||
Q_EMIT widgetChanged(w);
|
Q_EMIT widgetChanged(w);
|
||||||
setWindowTitle(uniqueName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QWidgetOrQuick *DockWidgetBase::widget() const
|
QWidgetOrQuick *DockWidgetBase::widget() const
|
||||||
@@ -556,7 +555,6 @@ void DockWidgetBase::Private::updateTitle()
|
|||||||
if (q->isFloating())
|
if (q->isFloating())
|
||||||
q->window()->setWindowTitle(title);
|
q->window()->setWindowTitle(title);
|
||||||
|
|
||||||
|
|
||||||
toggleAction->setText(title);
|
toggleAction->setText(title);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -536,10 +536,6 @@ void WidgetResizeHandler::setupWindow(QWindow *window)
|
|||||||
SetWindowPos(wid, 0, 0, 0, 0, 0,
|
SetWindowPos(wid, 0, 0, 0, 0, 0,
|
||||||
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
|
SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show drop-shadow:
|
|
||||||
MARGINS margins = { 0, 0, 0, 1 }; // arbitrary, just needs to be > 0 it seems
|
|
||||||
DwmExtendFrameIntoClientArea(wid, &margins);
|
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
Q_UNUSED(window);
|
Q_UNUSED(window);
|
||||||
|
|||||||
@@ -205,5 +205,7 @@ void FloatingWindowQuick::init()
|
|||||||
|
|
||||||
m_quickWindow->setFlags(windowFlags());
|
m_quickWindow->setFlags(windowFlags());
|
||||||
|
|
||||||
|
updateTitleAndIcon();
|
||||||
|
|
||||||
m_quickWindow->show();
|
m_quickWindow->show();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user