blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Campbell Barton 2022-11-12 17:10:36 +11:00
parent cd659f7bbf 787ae01dad
commit b973e27327
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,6 +106,8 @@ struct GWL_Window {
WGL_XDG_Decor_Window *xdg_decor = nullptr;
wl_egl_window *egl_window = nullptr;
std::string title;
bool is_maximised = false;
bool is_fullscreen = false;
bool is_active = false;
@ -128,6 +130,8 @@ static void gwl_window_title_set(GWL_Window *win, const char *title)
WGL_XDG_Decor_Window &decor = *win->xdg_decor;
xdg_toplevel_set_title(decor.toplevel, title);
}
win->title = title;
}
static GHOST_TWindowState gwl_window_state_get(const GWL_Window *win)
@ -664,7 +668,6 @@ GHOST_WindowWayland::GHOST_WindowWayland(GHOST_SystemWayland *system,
}
gwl_window_title_set(window_, title);
title_ = title;
wl_surface_set_user_data(window_->wl_surface, this);
@ -754,13 +757,11 @@ GHOST_TSuccess GHOST_WindowWayland::getCursorBitmap(GHOST_CursorBitmapRef *bitma
void GHOST_WindowWayland::setTitle(const char *title)
{
gwl_window_title_set(window_, title);
title_ = title;
}
std::string GHOST_WindowWayland::getTitle() const
{
return title_.empty() ? "untitled" : title_;
return window_->title.empty() ? "untitled" : window_->title;
}
void GHOST_WindowWayland::getWindowBounds(GHOST_Rect &bounds) const

1
intern/ghost/intern/GHOST_WindowWayland.h
View File

@ -119,7 +119,6 @@ class GHOST_WindowWayland : public GHOST_Window {
private:
GHOST_SystemWayland *system_;
struct GWL_Window *window_;
std::string title_;
/**
* \param type: The type of rendering context create.