mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

common: flesh out enum lab_edge and prefer over wlr_edges/wlr_direction

Browse source 
I like the new common/edge.h. I don't like how inconsistently we use it.

Current situation:

 - enum wlr_edges and wlr_direction are designed to be used as bitset,
   and are defined compatibly

 - enum lab_edge is *also* designed to be used as bitset, but
   incompatible with the others (LEFT/RIGHT come before UP/DOWN)

 - we use an inconsistent mix of all three *AND* uint32_t (usually with
   the WLR_EDGE constants rather than the LAB_EDGE constants), and
   convert between them on an ad-hoc basis, sometimes implicitly

Let's clean this up:

 - reorder enum lab_edge to be compatible with the two wlr enums
   (check this by static_assert)

 - use TOP/BOTTOM naming rather than UP/DOWN (matches wlr_edges)

 - add constants for the remaining possible combinations of the 4 edges

 - use lab_edge for all internal edge/direction fields, consistently

 - add lab_edge_is_cardinal() as a sanity check before casting to
   enum wlr_direction, and then eliminate all of direction.c/h

Instead of "enum wlr_edges direction", we now have
"enum lab_edge direction" which is not that much better. At least we
are now clear that we're overloading one enum with two meanings.
This commit is contained in:
John Lindgren 2025-08-26 20:27:34 -04:00
parent 4d1be7eada
commit ef766d16f0
26 changed files with 294 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/view-impl-common.c
View file

@ -59,7 +59,7 @@ view_impl_unmap(struct view *view)
}
static bool
resizing_edge(struct view *view, uint32_t edge)
resizing_edge(struct view *view, enum lab_edge edge)
{
struct server *server = view->server;
return server->input_mode == LAB_INPUT_STATE_RESIZE
@ -86,7 +86,7 @@ view_impl_apply_geometry(struct view *view, int w, int h)
* reliable on its own. The combination of the two methods
* should catch 99% of resize cases that we care about.
*/
bool resizing_left_edge = resizing_edge(view, WLR_EDGE_LEFT);
bool resizing_left_edge = resizing_edge(view, LAB_EDGE_LEFT);
if (resizing_left_edge || (current->x != pending->x
&& current->x + current->width ==
pending->x + pending->width)) {
@ -96,7 +96,7 @@ view_impl_apply_geometry(struct view *view, int w, int h)
}
/* Anchor bottom edge if resizing via top edge */
bool resizing_top_edge = resizing_edge(view, WLR_EDGE_TOP);
bool resizing_top_edge = resizing_edge(view, LAB_EDGE_TOP);
if (resizing_top_edge || (current->y != pending->y
&& current->y + current->height ==
pending->y + pending->height)) {