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

Cleanup: use early returns in wm_window_title

Browse Source 
Also avoid unnecessary std::string creation.
This commit is contained in:
Campbell Barton
2023-10-13 11:18:41 +11:00
parent c0333b811e
commit 432bef802f
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
source/blender/windowmanager/intern/wm_window.cc
View File

@@ -480,48 +480,54 @@ void wm_window_close(bContext *C, wmWindowManager *wm, wmWindow *win)
void wm_window_title(wmWindowManager *wm, wmWindow *win)
{
if (win->ghostwin == nullptr) {
return;
}
if (WM_window_is_temp_screen(win)) {
/* Nothing to do for 'temp' windows,
* because #WM_window_open always sets window title. */
return;
}
else if (win->ghostwin) {
GHOST_WindowHandle handle = static_cast<GHOST_WindowHandle>(win->ghostwin);
const char *filepath = BKE_main_blendfile_path_from_global();
const char *filename = BLI_path_basename(filepath);
GHOST_WindowHandle handle = static_cast<GHOST_WindowHandle>(win->ghostwin);
const bool has_filepath = filepath[0] != '\0';
const bool include_filepath = has_filepath && (filepath != filename) &&
(GHOST_SetPath(handle, filepath) == GHOST_kFailure);
const char *filepath = BKE_main_blendfile_path_from_global();
const char *filename = BLI_path_basename(filepath);
std::string str;
str += wm->file_saved ? " " : "* ";
if (has_filepath) {
const size_t filename_no_ext_len = BLI_path_extension_or_end(filename) - filename;
str.append(filename, filename_no_ext_len);
}
else {
str += IFACE_("(Unsaved)");
}
const bool has_filepath = filepath[0] != '\0';
const bool include_filepath = has_filepath && (filepath != filename) &&
(GHOST_SetPath(handle, filepath) == GHOST_kFailure);
if (G_MAIN->recovered) {
str += IFACE_(" (Recovered)");
}
if (include_filepath) {
str += " [" + std::string(filepath) + "]";
}
str += " - Blender ";
str += BKE_blender_version_string_compact();
GHOST_SetTitle(handle, str.c_str());
/* Informs GHOST of unsaved changes to set the window modified visual indicator (macOS)
* and to give a hint of unsaved changes for a user warning mechanism in case of OS application
* terminate request (e.g., OS Shortcut Alt+F4, Command+Q, (...) or session end). */
GHOST_SetWindowModifiedState(handle, bool(!wm->file_saved));
std::string str;
str += wm->file_saved ? " " : "* ";
if (has_filepath) {
const size_t filename_no_ext_len = BLI_path_extension_or_end(filename) - filename;
str.append(filename, filename_no_ext_len);
}
else {
str += IFACE_("(Unsaved)");
}
if (G_MAIN->recovered) {
str += IFACE_(" (Recovered)");
}
if (include_filepath) {
str += " [";
str += filepath;
str += "]";
}
str += " - Blender ";
str += BKE_blender_version_string_compact();
GHOST_SetTitle(handle, str.c_str());
/* Informs GHOST of unsaved changes to set the window modified visual indicator (macOS)
* and to give a hint of unsaved changes for a user warning mechanism in case of OS application
* terminate request (e.g., OS Shortcut Alt+F4, Command+Q, (...) or session end). */
GHOST_SetWindowModifiedState(handle, bool(!wm->file_saved));
}
void WM_window_set_dpi(const wmWindow *win)