Rename Window::clientMaximizeStateChanged signal

Make it shorter to be more readable.
remotes/origin/work/zamundaaa/gbm-swapchain
Vlad Zahorodnii 3 years ago
parent 88c974835c
commit 8bb2d52972
  1. 2
      autotests/integration/dont_crash_aurorae_destroy_deco.cpp
  2. 2
      autotests/integration/effects/maximize_animation_test.cpp
  3. 2
      autotests/integration/quick_tiling_test.cpp
  4. 4
      src/effects.cpp
  5. 4
      src/placementtracker.cpp
  6. 4
      src/window.cpp
  7. 4
      src/window.h
  8. 4
      src/x11window.cpp
  9. 4
      src/xdgshellwindow.cpp

@ -114,7 +114,7 @@ void DontCrashAuroraeDestroyDecoTest::testBorderlessMaximizedWindows()
QVERIFY(window->readyForPainting());
// simulate click on maximize button
QSignalSpy maximizedStateChangedSpy(window, &Window::clientMaximizedStateChanged);
QSignalSpy maximizedStateChangedSpy(window, &Window::maximizedChanged);
quint32 timestamp = 1;
Test::pointerMotion(window->frameGeometry().topLeft() + scenePoint.toPoint(), timestamp++);
Test::pointerButtonPressed(BTN_LEFT, timestamp++);

@ -128,7 +128,7 @@ void MaximizeAnimationTest::testMaximizeRestore()
// Maximize the window.
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
QSignalSpy maximizeChangedSpy(window, &Window::clientMaximizedStateChanged);
QSignalSpy maximizeChangedSpy(window, &Window::maximizedChanged);
workspace()->slotWindowMaximize();
QVERIFY(surfaceConfigureRequestedSpy.wait());

@ -240,7 +240,7 @@ void QuickTilingTest::testQuickMaximizing()
QSignalSpy quickTileChangedSpy(window, &Window::quickTileModeChanged);
QSignalSpy frameGeometryChangedSpy(window, &Window::frameGeometryChanged);
QSignalSpy maximizeChangedSpy(window, &Window::clientMaximizedStateChanged);
QSignalSpy maximizeChangedSpy(window, &Window::maximizedChanged);
window->setQuickTileMode(QuickTileFlag::Maximize, true);
QCOMPARE(quickTileChangedSpy.count(), 1);

@ -290,9 +290,9 @@ void EffectsHandlerImpl::unloadAllEffects()
void EffectsHandlerImpl::setupWindowConnections(Window *window)
{
connect(window, &Window::windowClosed, this, &EffectsHandlerImpl::slotWindowClosed);
connect(window, &Window::clientMaximizedStateChanged,
connect(window, &Window::maximizedChanged,
this, &EffectsHandlerImpl::slotClientMaximized);
connect(window, static_cast<void (Window::*)(KWin::Window *, MaximizeMode)>(&Window::clientMaximizedStateAboutToChange),
connect(window, static_cast<void (Window::*)(KWin::Window *, MaximizeMode)>(&Window::maximizedAboutToChange),
this, [this](KWin::Window *window, MaximizeMode m) {
if (EffectWindowImpl *w = window->effectWindow()) {
Q_EMIT windowMaximizedStateAboutToChange(w, m & MaximizeHorizontal, m & MaximizeVertical);

@ -39,7 +39,7 @@ void PlacementTracker::add(Window *window)
return;
}
connect(window, &Window::frameGeometryChanged, this, &PlacementTracker::saveGeometry);
connect(window, &Window::clientMaximizedStateChanged, this, &PlacementTracker::saveMaximize);
connect(window, &Window::maximizedChanged, this, &PlacementTracker::saveMaximize);
connect(window, &Window::quickTileModeChanged, this, &PlacementTracker::saveQuickTile);
connect(window, &Window::fullScreenChanged, this, &PlacementTracker::saveFullscreen);
connect(window, &Window::clientFinishUserMovedResized, this, &PlacementTracker::saveInteractionCounter);
@ -52,7 +52,7 @@ void PlacementTracker::remove(Window *window)
{
if (m_savedWindows.contains(window)) {
disconnect(window, &Window::frameGeometryChanged, this, &PlacementTracker::saveGeometry);
disconnect(window, &Window::clientMaximizedStateChanged, this, &PlacementTracker::saveMaximize);
disconnect(window, &Window::maximizedChanged, this, &PlacementTracker::saveMaximize);
disconnect(window, &Window::quickTileModeChanged, this, &PlacementTracker::saveQuickTile);
disconnect(window, &Window::fullScreenChanged, this, &PlacementTracker::saveFullscreen);
disconnect(window, &Window::clientFinishUserMovedResized, this, &PlacementTracker::saveInteractionCounter);

@ -99,7 +99,7 @@ Window::Window()
connect(this, &Window::clientFinishUserMovedResized, this, [this]() {
m_keyboardGeometryRestore = QRectF();
});
connect(this, &Window::clientMaximizedStateChanged, this, [this]() {
connect(this, &Window::maximizedChanged, this, [this]() {
m_keyboardGeometryRestore = QRectF();
});
connect(this, &Window::fullScreenChanged, this, [this]() {
@ -2223,7 +2223,7 @@ void Window::setupWindowManagementInterface()
connect(this, &Window::minimizedChanged, w, [w, this] {
w->setMinimized(isMinimized());
});
connect(this, &Window::clientMaximizedStateChanged, w, [w](KWin::Window *c, MaximizeMode mode) {
connect(this, &Window::maximizedChanged, w, [w](KWin::Window *c, MaximizeMode mode) {
w->setMaximized(mode == KWin::MaximizeFull);
});
connect(this, &Window::demandsAttentionChanged, w, [w, this] {

@ -1520,8 +1520,8 @@ Q_SIGNALS:
void paletteChanged(const QPalette &p);
void colorSchemeChanged();
void captionChanged();
void clientMaximizedStateAboutToChange(KWin::Window *, MaximizeMode);
void clientMaximizedStateChanged(KWin::Window *, MaximizeMode);
void maximizedAboutToChange(KWin::Window *, MaximizeMode);
void maximizedChanged(KWin::Window *, MaximizeMode);
void transientChanged();
void modalChanged();
void quickTileModeChanged();

@ -4327,7 +4327,7 @@ void X11Window::maximize(MaximizeMode mode)
maximize(MaximizeRestore); // restore
}
Q_EMIT clientMaximizedStateAboutToChange(this, mode);
Q_EMIT maximizedAboutToChange(this, mode);
max_mode = mode;
// save sizes for restoring, if maximalizing
@ -4537,7 +4537,7 @@ void X11Window::maximize(MaximizeMode mode)
Q_EMIT quickTileModeChanged();
if (max_mode != old_mode) {
Q_EMIT clientMaximizedStateChanged(this, max_mode);
Q_EMIT maximizedChanged(this, max_mode);
}
}

@ -1424,7 +1424,7 @@ void XdgToplevelWindow::updateMaximizeMode(MaximizeMode maximizeMode)
}
m_maximizeMode = maximizeMode;
updateWindowRules(Rules::MaximizeVert | Rules::MaximizeHoriz);
Q_EMIT clientMaximizedStateChanged(this, maximizeMode);
Q_EMIT maximizedChanged(this, maximizeMode);
}
void XdgToplevelWindow::updateFullScreenMode(bool set)
@ -1650,7 +1650,7 @@ void XdgToplevelWindow::maximize(MaximizeMode mode)
return;
}
Q_EMIT clientMaximizedStateAboutToChange(this, mode);
Q_EMIT maximizedAboutToChange(this, mode);
m_requestedMaximizeMode = mode;
// call into decoration update borders

Loading…
Cancel
Save