griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: use local variable, replace pointer with reference

Browse Source
This commit is contained in:
Campbell Barton
2023-12-14 23:12:57 +11:00
parent 40a89c0984
commit 5197dd2a7a
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
intern/ghost/intern/GHOST_WindowWayland.cc
View File

@@ -1164,7 +1164,7 @@ static void libdecor_frame_handle_configure(libdecor_frame *frame,
}();
# endif
GWL_WindowFrame *frame_pending = &static_cast<GWL_Window *>(data)->frame_pending;
GWL_WindowFrame &frame_pending = static_cast<GWL_Window *>(data)->frame_pending;
/* Set the size. */
int size_next[2] = {0, 0};
@@ -1199,25 +1199,23 @@ static void libdecor_frame_handle_configure(libdecor_frame *frame,
if (libdecor_configuration_get_content_size(
configuration, frame, &size_next[0], &size_next[1])) {
if (fractional_scale) {
win->frame_pending.size[0] = gwl_window_fractional_to_viewport_round(win->frame,
size_next[0]);
win->frame_pending.size[1] = gwl_window_fractional_to_viewport_round(win->frame,
size_next[1]);
frame_pending.size[0] = gwl_window_fractional_to_viewport_round(win->frame, size_next[0]);
frame_pending.size[1] = gwl_window_fractional_to_viewport_round(win->frame, size_next[1]);
}
else if (fractional_scale && (fractional_scale != (scale * FRACTIONAL_DENOMINATOR))) {
/* The windows `preferred_scale` is not yet available,
* set the size as if fractional scale is available. */
frame_pending->size[0] = ((size_next[0] * scale) * fractional_scale) / scale_as_fractional;
frame_pending->size[1] = ((size_next[1] * scale) * fractional_scale) / scale_as_fractional;
frame_pending.size[0] = ((size_next[0] * scale) * fractional_scale) / scale_as_fractional;
frame_pending.size[1] = ((size_next[1] * scale) * fractional_scale) / scale_as_fractional;
}
else {
frame_pending->size[0] = size_next[0] * scale;
frame_pending->size[1] = size_next[1] * scale;
frame_pending.size[0] = size_next[0] * scale;
frame_pending.size[1] = size_next[1] * scale;
}
/* Account for buffer rounding requirement, once fractional scaling is enabled
* the buffer scale will be 1, rounding is a requirement until then. */
gwl_round_int2_by(frame_pending->size, win->frame.buffer_scale);
gwl_round_int2_by(frame_pending.size, win->frame.buffer_scale);
has_size = true;
}
@@ -1245,9 +1243,9 @@ static void libdecor_frame_handle_configure(libdecor_frame *frame,
{
enum libdecor_window_state window_state;
if (libdecor_configuration_get_window_state(configuration, &window_state)) {
frame_pending->is_maximised = window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED;
frame_pending->is_fullscreen = window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN;
frame_pending->is_active = window_state & LIBDECOR_WINDOW_STATE_ACTIVE;
frame_pending.is_maximised = window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED;
frame_pending.is_fullscreen = window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN;
frame_pending.is_active = window_state & LIBDECOR_WINDOW_STATE_ACTIVE;
}
}