Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
94bbe14f
Commit
94bbe14f
authored
Apr 18, 2022
by
Vlad Zahorodnii
Browse files
Remove AbstractClient plumbing casts in Placement
parent
85be7c2b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/placement.cpp
View file @
94bbe14f
...
...
@@ -154,7 +154,7 @@ void Placement::placeAtRandom(AbstractClient *c, const QRect &area, Policy /*nex
// TODO: one day, there'll be C++11 ...
static
inline
bool
isIrrelevant
(
const
AbstractClient
*
client
,
const
AbstractClient
*
regarding
,
int
desktop
)
{
if
(
!
client
)
{
if
(
!
client
->
isClient
()
)
{
return
true
;
}
if
(
client
==
regarding
)
{
...
...
@@ -232,8 +232,7 @@ void Placement::placeSmart(AbstractClient *c, const QRect &area, Policy /*next*/
cyt
=
y
;
cyb
=
y
+
ch
;
for
(
auto
l
=
workspace
()
->
stackingOrder
().
constBegin
();
l
!=
workspace
()
->
stackingOrder
().
constEnd
();
++
l
)
{
auto
t
=
*
l
;
auto
client
=
static_cast
<
AbstractClient
*>
(
t
->
isClient
()
?
t
:
nullptr
);
auto
client
=
*
l
;
if
(
isIrrelevant
(
client
,
c
,
desktop
))
{
continue
;
}
...
...
@@ -287,8 +286,7 @@ void Placement::placeSmart(AbstractClient *c, const QRect &area, Policy /*next*/
// compare to the position of each client on the same desk
for
(
auto
l
=
workspace
()
->
stackingOrder
().
constBegin
();
l
!=
workspace
()
->
stackingOrder
().
constEnd
();
++
l
)
{
auto
t
=
*
l
;
auto
client
=
static_cast
<
AbstractClient
*>
(
t
->
isClient
()
?
t
:
nullptr
);
auto
client
=
*
l
;
if
(
isIrrelevant
(
client
,
c
,
desktop
))
{
continue
;
}
...
...
@@ -326,8 +324,7 @@ void Placement::placeSmart(AbstractClient *c, const QRect &area, Policy /*next*/
// test the position of each window on the desk
for
(
auto
l
=
workspace
()
->
stackingOrder
().
constBegin
();
l
!=
workspace
()
->
stackingOrder
().
constEnd
();
++
l
)
{
auto
t
=
*
l
;
auto
client
=
static_cast
<
AbstractClient
*>
(
t
->
isClient
()
?
t
:
nullptr
);
auto
client
=
*
l
;
if
(
isIrrelevant
(
client
,
c
,
desktop
))
{
continue
;
}
...
...
@@ -636,12 +633,11 @@ void Placement::cascadeDesktop()
reinitCascading
(
desktop
);
const
auto
stackingOrder
=
ws
->
stackingOrder
();
for
(
AbstractClient
*
toplevel
:
stackingOrder
)
{
auto
client
=
static_cast
<
AbstractClient
*>
(
toplevel
->
isClient
()
?
toplevel
:
nullptr
);
if
(
!
client
||
(
!
client
->
isOnCurrentDesktop
())
||
(
client
->
isMinimized
())
||
(
client
->
isOnAllDesktops
())
||
(
!
client
->
isMovable
()))
{
if
(
!
toplevel
->
isClient
()
||
(
!
toplevel
->
isOnCurrentDesktop
())
||
(
toplevel
->
isMinimized
())
||
(
toplevel
->
isOnAllDesktops
())
||
(
!
toplevel
->
isMovable
()))
{
continue
;
}
const
QRect
placementArea
=
workspace
()
->
clientArea
(
PlacementArea
,
client
);
placeCascaded
(
client
,
placementArea
);
const
QRect
placementArea
=
workspace
()
->
clientArea
(
PlacementArea
,
toplevel
);
placeCascaded
(
toplevel
,
placementArea
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment