blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Campbell Barton 2022-11-12 17:10:42 +11:00
parent 935d6a965a 436e6dca24
commit 4737f9cff2
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
intern/ghost/intern/GHOST_WindowWayland.cpp
View File

@ -363,6 +363,7 @@ static void frame_handle_configure(struct libdecor_frame *frame,
int size_next[2];
enum libdecor_window_state window_state;
struct libdecor_state *state;
bool do_redraw = false;
if (!libdecor_configuration_get_content_size(
configuration, frame, &size_next[0], &size_next[1])) {
@ -387,14 +388,34 @@ static void frame_handle_configure(struct libdecor_frame *frame,
win->is_maximised = window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED;
win->is_fullscreen = window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN;
win->is_active = window_state & LIBDECOR_WINDOW_STATE_ACTIVE;
win->is_active ? win->ghost_window->activate() : win->ghost_window->deactivate();
GHOST_SystemWayland *system = static_cast<GHOST_SystemWayland *>(GHOST_ISystem::getSystem());
const bool is_active_prev_ghost = (win->ghost_window ==
system->getWindowManager()->getActiveWindow());
win->is_active = window_state & LIBDECOR_WINDOW_STATE_ACTIVE;
if (is_active_prev_ghost != win->is_active) {
if (win->is_active) {
win->ghost_window->activate();
}
else {
win->ghost_window->deactivate();
}
}
const bool is_active_prev_decor = win->is_active;
if (is_active_prev_decor) {
/* Without this, activating another window doesn't refresh the title-bar as inactive. */
do_redraw = true;
}
state = libdecor_state_new(UNPACK2(size_next));
libdecor_frame_commit(frame, state, configuration);
libdecor_state_free(state);
if (do_redraw) {
win->ghost_window->swapBuffers();
}
win->libdecor->configured = true;
}
@ -479,11 +500,16 @@ static void xdg_surface_handle_configure(void *data,
win->ghost_window->notify_size();
}
if (win->is_active) {
win->ghost_window->activate();
}
else {
win->ghost_window->deactivate();
GHOST_SystemWayland *system = static_cast<GHOST_SystemWayland *>(GHOST_ISystem::getSystem());
const bool is_active_prev_ghost = (win->ghost_window ==
system->getWindowManager()->getActiveWindow());
if (is_active_prev_ghost != win->is_active) {
if (win->is_active) {
win->ghost_window->activate();
}
else {
win->ghost_window->deactivate();
}
}
xdg_surface_ack_configure(xdg_surface, serial);