yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer en_US, "centre" -> "center"

Browse source
This commit is contained in:
Marius P 2024-06-16 22:58:26 +03:00 committed by Vlad Zahorodnii
parent 64bbbde249
commit ba599a2aa0
5 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autotests/integration/transient_placement.cpp
View file

@ -114,7 +114,7 @@ void TransientPlacementTest::testXdgPopup_data()
.anchor = Test::XdgPositioner::anchor_none,
.gravity = Test::XdgPositioner::gravity_bottom_right,
};
QTest::newRow("anchorCentre") << QSize(500, 500) << QPoint(300, 300) << layoutAnchorCenter << QRect(550, 550, 200, 200);
QTest::newRow("anchorCenter") << QSize(500, 500) << QPoint(300, 300) << layoutAnchorCenter << QRect(550, 550, 200, 200);
const PopupLayout layoutAnchorTopLeft{
.anchorRect = QRect(50, 50, 400, 400),
@ -189,7 +189,7 @@ void TransientPlacementTest::testXdgPopup_data()
.anchor = Test::XdgPositioner::anchor_bottom_right,
.gravity = Test::XdgPositioner::gravity_none,
};
QTest::newRow("gravityCentre") << QSize(500, 500) << QPoint(300, 300) << layoutGravityCenter << QRect(650, 650, 200, 200);
QTest::newRow("gravityCenter") << QSize(500, 500) << QPoint(300, 300) << layoutGravityCenter << QRect(650, 650, 200, 200);
const PopupLayout layoutGravityTopLeft{
.anchorRect = QRect(50, 50, 400, 400),

2
src/plugins/zoom/zoom.cpp
View file

@ -318,7 +318,7 @@ void ZoomEffect::paintScreen(const RenderTarget &renderTarget, const RenderViewp
yTranslation = -int(cursorPoint.y() * (zoom - 1.0));
prevPoint = cursorPoint;
break;
case MouseTrackingCentred:
case MouseTrackingCentered:
prevPoint = cursorPoint;
// fall through
case MouseTrackingDisabled:

2
src/plugins/zoom/zoom.h
View file

@ -110,7 +110,7 @@ private:
double zoomFactor;
enum MouseTrackingType {
MouseTrackingProportional = 0,
MouseTrackingCentred = 1,
MouseTrackingCentered = 1,
MouseTrackingPush = 2,
MouseTrackingDisabled = 3,
};

5
src/plugins/zoom/zoom_config.h
View file

@ -27,11 +27,6 @@ public Q_SLOTS:
private:
Ui::ZoomEffectConfigForm m_ui;
enum MouseTracking {
MouseCentred = 0,
MouseProportional = 1,
MouseDisabled = 2,
};
};
} // namespace

4
src/useractions.cpp
View file

@ -1589,7 +1589,7 @@ void Workspace::switchWindow(Direction direction)
Window *window = m_activeWindow;
VirtualDesktop *desktop = VirtualDesktopManager::self()->currentDesktop();
// Centre of the active window
// Center of the active window
QPoint curPos(window->x() + window->width() / 2, window->y() + window->height() / 2);
if (!switchWindow(window, direction, curPos, desktop)) {
@ -1624,7 +1624,7 @@ bool Workspace::switchWindow(Window *window, Direction direction, QPoint curPos,
continue;
}
if (other->wantsTabFocus() && *i != window && other->isOnDesktop(desktop) && !other->isMinimized() && (*i)->isOnCurrentActivity()) {
// Centre of the other window
// Center of the other window
const QPoint otherCenter(other->x() + other->width() / 2, other->y() + other->height() / 2);
int distance;