Fix #112978: MacOS no longer has a path associated with the window #113227

Merged
Germano Cavalcante merged 1 commits from mano-wii/blender:fix_112978 into main 2023-10-05 02:26:19 +02:00

The problem was introduced in 636f3697ee

MacOS has a different way of handling the title.

In this OS the directory is searched and taken from the title string
which is then formatted.

This limits the title format and makes it prone to errors.

This commit makes the code more generic by splitting each component of
the title beforehand.

Each OS deals with these components in its own way.


The problem was introduced in 636f3697ee MacOS has a different way of handling the title. In this OS the directory is searched and taken from the title string which is then formatted. This limits the title format and makes it prone to errors. This commit makes the code more generic by splitting each component of the title beforehand. Each OS deals with these components in its own way. ---
Germano Cavalcante requested review from Brecht Van Lommel 2023-10-04 02:02:51 +02:00
Germano Cavalcante requested review from Campbell Barton 2023-10-04 02:02:51 +02:00
Germano Cavalcante requested review from Harley Acheson 2023-10-04 02:02:52 +02:00
Germano Cavalcante added this to the Platforms, Builds Tests & Devices project 2023-10-04 02:03:02 +02:00
Author
Member

@blender-bot build

@blender-bot build
Member

It definitely does all the right things on Windows:

image

It doesn't show the final backslash for the path, but that is probably an improvement too. It does show the backslash if the path is root.

It definitely does all the right things on Windows: ![image](/attachments/e8736f18-8977-485e-bf19-fe8e482b2fba) It doesn't show the final backslash for the path, but that is probably an improvement too. It does show the backslash if the path is root.

In this case I think it makes most sense to have a separate API to set the filepath assosiated with a window.

Suggest to add an API call for macOS:

GHOST_SetTitle(..);
GHOST_SetPath(..);

This means the formatting can stay in on place wm_window_title and GHOST backends that make use the filepath can use it if they need.

With this PR - tweaks to the title formatting become more complicated, e.g. abbreviating paths (replacing /home/username/ with ~) or adding a title format preference become more involved, needing changes in multiple locations, it just seems simpler to keep the title formatting in one place. If GHOST backends can associate additional information - API's calls can be added to support that.

In this case I think it makes most sense to have a separate API to set the filepath assosiated with a window. Suggest to add an API call for macOS: ``` GHOST_SetTitle(..); GHOST_SetPath(..); ``` This means the formatting can stay in on place `wm_window_title` and GHOST backends that make use the filepath can use it if they need. With this PR - tweaks to the title formatting become more complicated, e.g. abbreviating paths (replacing `/home/username/` with `~`) or adding a title format preference become more involved, needing changes in multiple locations, it just seems simpler to keep the title formatting in one place. If GHOST backends can associate additional information - API's calls can be added to support that.
Brecht Van Lommel requested changes 2023-10-04 15:29:34 +02:00
Brecht Van Lommel left a comment
Owner

I agree it would be good to keep the string formatting on the Blender side.

That could still be done with a single GHOST_SetTitle, with arguments title_with_file, title_without_file, filepath.

I agree it would be good to keep the string formatting on the Blender side. That could still be done with a single `GHOST_SetTitle`, with arguments `title_with_file`, `title_without_file`, `filepath`.

Cleaner than #ifdef __APPLE__ on the Blender side would be for GHOST_SetAssociatedFile to return a boolean indicating if the backend implements it.

Cleaner than `#ifdef __APPLE__` on the Blender side would be for `GHOST_SetAssociatedFile` to return a boolean indicating if the backend implements it.
Author
Member

Code seems improved.
GHOST_SetPath now returns GHOST_kSuccess when the backend supports associated file.

@blender-bot build

Code seems improved. `GHOST_SetPath` now returns `GHOST_kSuccess` when the backend supports associated file. @blender-bot build
Brecht Van Lommel requested changes 2023-10-04 16:28:23 +02:00
@ -0,0 +1,38 @@
/* SPDX-FileCopyrightText: 2002-2023 Blender Authors

This can be removed now.

This can be removed now.
brecht marked this conversation as resolved
@ -510,0 +495,4 @@
std::string str;
str += wm->file_saved ? "" : "*";
str += has_filepath ? filename : IFACE_("(Unsaved)");

There's a spacing missing here between * and (Unsaved), compared to before.

There's a spacing missing here between `*` and `(Unsaved)`, compared to before.

Now there is a space at the start of the title, though that was already the case before and I guess you can't see it.

Now there is a space at the start of the title, though that was already the case before and I guess you can't see it.
mano-wii marked this conversation as resolved
Brecht Van Lommel approved these changes 2023-10-04 16:44:22 +02:00
Harley Acheson approved these changes 2023-10-04 23:47:21 +02:00
Harley Acheson left a comment
Member

Nice!

Nice!
Campbell Barton approved these changes 2023-10-05 00:52:03 +02:00
Germano Cavalcante force-pushed fix_112978 from 5afdd05243 to d6b2b5d0c5 2023-10-05 02:25:02 +02:00 Compare
Germano Cavalcante merged commit bd6b7088bf into main 2023-10-05 02:26:19 +02:00
Germano Cavalcante deleted branch fix_112978 2023-10-05 02:26:21 +02:00
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#113227
No description provided.