Skip to content

Commit a280441

Browse files
committedJul 15, 2024·
Merge branch 'skia_2024'
2 parents be8e886 + 48d2bd8 commit a280441

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed
 

‎lib/include/elements/element/grid.hpp

+1-1
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

+10-12
Original file line numberDiff line numberDiff line change
@@ -146,21 +146,19 @@ namespace cycfi::elements
146146

147147
if (l_resize)
148148
{
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);
149+
set_cursor(t_resize?
150+
cursor_type::nwse_resize :
151+
b_resize? cursor_type::nesw_resize :
152+
cursor_type::ew_resize
153+
);
155154
}
156155
else if (r_resize)
157156
{
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);
157+
set_cursor(t_resize?
158+
cursor_type::nesw_resize :
159+
b_resize? cursor_type::nwse_resize :
160+
cursor_type::ew_resize
161+
);
164162
}
165163
else if (t_resize || b_resize)
166164
{

0 commit comments

Comments
 (0)
Please sign in to comment.