Skip to content

Commit cfb1b7a

Browse files
committed
frames.c: Fix calculations for determining resize zones in a tiled
state.
1 parent c845b36 commit cfb1b7a

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/ui/frames.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,61 +1927,61 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
19271927
if (y >= (fgeom.height - fgeom.borders.total.bottom * CORNER_SIZE_MULT) &&
19281928
x >= (fgeom.width - fgeom.borders.total.right * CORNER_SIZE_MULT))
19291929
{
1930-
if (has_vert && has_horiz)
1930+
if ((has_vert && has_horiz) || (flags & META_FRAME_TILED_ULC))
19311931
return META_FRAME_CONTROL_RESIZE_SE;
1932-
else if (has_vert)
1932+
else if (has_vert || (flags & META_FRAME_TILED_TOP_EDGES))
19331933
return META_FRAME_CONTROL_RESIZE_S;
1934-
else if (has_horiz)
1934+
else if (has_horiz || (flags & META_FRAME_TILED_LEFT_EDGES))
19351935
return META_FRAME_CONTROL_RESIZE_E;
19361936
}
19371937
else if (y >= (fgeom.height - fgeom.borders.total.bottom * CORNER_SIZE_MULT) &&
19381938
x <= fgeom.borders.total.left * CORNER_SIZE_MULT)
19391939
{
1940-
if (has_vert && has_horiz)
1940+
if ((has_vert && has_horiz) || (flags & META_FRAME_TILED_URC))
19411941
return META_FRAME_CONTROL_RESIZE_SW;
1942-
else if (has_vert)
1942+
else if (has_vert || (flags & META_FRAME_TILED_TOP_EDGES))
19431943
return META_FRAME_CONTROL_RESIZE_S;
1944-
else if (has_horiz)
1944+
else if (has_horiz || (flags & META_FRAME_TILED_RIGHT_EDGES))
19451945
return META_FRAME_CONTROL_RESIZE_W;
19461946
}
19471947
else if (y < (fgeom.borders.invisible.top * CORNER_SIZE_MULT) &&
19481948
x <= (fgeom.borders.total.left * CORNER_SIZE_MULT) && has_north_resize)
19491949
{
1950-
if (has_vert && has_horiz)
1950+
if ((has_vert && has_horiz) || (flags & META_FRAME_TILED_LRC))
19511951
return META_FRAME_CONTROL_RESIZE_NW;
1952-
else if (has_vert)
1952+
else if (has_vert || (flags & META_FRAME_TILED_BOTTOM_EDGES))
19531953
return META_FRAME_CONTROL_RESIZE_N;
1954-
else if (has_horiz)
1954+
else if (has_horiz || (flags & META_FRAME_TILED_RIGHT_EDGES))
19551955
return META_FRAME_CONTROL_RESIZE_W;
19561956
}
19571957
else if (y < (fgeom.borders.invisible.top * CORNER_SIZE_MULT) &&
19581958
x >= (fgeom.width - fgeom.borders.total.right * CORNER_SIZE_MULT) && has_north_resize)
19591959
{
1960-
if (has_vert && has_horiz)
1960+
if ((has_vert && has_horiz) || (flags & META_FRAME_TILED_LLC))
19611961
return META_FRAME_CONTROL_RESIZE_NE;
1962-
else if (has_vert)
1962+
else if (has_vert || (flags & META_FRAME_TILED_BOTTOM_EDGES))
19631963
return META_FRAME_CONTROL_RESIZE_N;
1964-
else if (has_horiz)
1964+
else if (has_horiz || (flags & META_FRAME_TILED_LEFT_EDGES))
19651965
return META_FRAME_CONTROL_RESIZE_E;
19661966
}
19671967
else if (y < (fgeom.borders.invisible.top + TOP_RESIZE_HEIGHT))
19681968
{
1969-
if ((has_vert || flags & (META_FRAME_TILED_BOTTOM | META_FRAME_TILED_LLC | META_FRAME_TILED_LRC)) && has_north_resize)
1969+
if ((has_vert || (flags & META_FRAME_TILED_BOTTOM_EDGES)) && has_north_resize)
19701970
return META_FRAME_CONTROL_RESIZE_N;
19711971
}
19721972
else if (y >= (fgeom.height - fgeom.borders.total.bottom))
19731973
{
1974-
if (has_vert || flags & (META_FRAME_TILED_TOP | META_FRAME_TILED_ULC | META_FRAME_TILED_URC))
1974+
if (has_vert || (flags & META_FRAME_TILED_TOP_EDGES))
19751975
return META_FRAME_CONTROL_RESIZE_S;
19761976
}
19771977
else if (x <= fgeom.borders.total.left)
19781978
{
1979-
if (has_horiz || flags & (META_FRAME_TILED_RIGHT | META_FRAME_TILED_URC | META_FRAME_TILED_LRC))
1979+
if (has_horiz || (flags & META_FRAME_TILED_RIGHT_EDGES))
19801980
return META_FRAME_CONTROL_RESIZE_W;
19811981
}
19821982
else if (x >= (fgeom.width - fgeom.borders.total.right))
19831983
{
1984-
if (has_horiz || flags & (META_FRAME_TILED_LEFT | META_FRAME_TILED_ULC | META_FRAME_TILED_LLC))
1984+
if (has_horiz || (flags & META_FRAME_TILED_LEFT_EDGES))
19851985
return META_FRAME_CONTROL_RESIZE_E;
19861986
}
19871987

0 commit comments

Comments
 (0)