Skip to content

Commit ca324af

Browse files
committed
More simplification
1 parent 9e31bb3 commit ca324af

2 files changed

Lines changed: 7 additions & 23 deletions

File tree

lib/include/elements/element/grid.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ namespace cycfi::elements
303303

304304
/**
305305
* \brief
306-
* Create a horizontal grid layout, given column coordinates as an
306+
* Create a horizontal grid layout, given column coordinates as a
307307
* `std::array`.
308308
*
309309
* \tparam N

lib/src/element/child_window.cpp

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -144,32 +144,16 @@ namespace cycfi::elements
144144
else if (within(p.y, b.bottom-resize_margin-1, b.bottom))
145145
b_resize = true;
146146

147+
using enum cursor_type;
148+
147149
if (l_resize)
148-
{
149-
if (t_resize)
150-
set_cursor(cursor_type::nwse_resize);
151-
else if (b_resize)
152-
set_cursor(cursor_type::nesw_resize);
153-
else
154-
set_cursor(cursor_type::ew_resize);
155-
}
150+
set_cursor(t_resize? nwse_resize : b_resize? nesw_resize : ew_resize);
156151
else if (r_resize)
157-
{
158-
if (t_resize)
159-
set_cursor(cursor_type::nesw_resize);
160-
else if (b_resize)
161-
set_cursor(cursor_type::nwse_resize);
162-
else
163-
set_cursor(cursor_type::ew_resize);
164-
}
152+
set_cursor(t_resize? nesw_resize : b_resize? nwse_resize : ew_resize);
165153
else if (t_resize || b_resize)
166-
{
167-
set_cursor(cursor_type::ns_resize);
168-
}
154+
set_cursor(ns_resize);
169155
else
170-
{
171-
set_cursor(cursor_type::arrow);
172-
}
156+
set_cursor(arrow);
173157

174158
return true;
175159
}

0 commit comments

Comments
 (0)