Fix not being able to select an editor layout created in another language #13298
Conversation
YeldhamDev
changed the title
YeldhamDev
force-pushed
the
translation_layout
branch
from
2c952b8 to
3b8ba19
Compare
editor/editor_node.cpp
Outdated
| @@ -5262,13 +5262,15 @@ EditorNode::EditorNode() { | |||
| } | |||
|
|
|||
| scene_tree_dock = memnew(SceneTreeDock(this, scene_root, editor_selection, editor_data)); | |||
| scene_tree_dock->set_name(TTR("Scene")); | |||
| scene_tree_dock->set_name("Scene"); | |||
There was a problem hiding this comment.
That name should likely be set directly in SceneTreeDock's constructor no? Same for others.
There was a problem hiding this comment.
Only the Node dock was set in the constructor before, but if you want them all to be, sure.
editor/editor_node.cpp
Outdated
| dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(scene_tree_dock); | ||
| dock_slot[DOCK_SLOT_RIGHT_UL]->set_tab_title(dock_slot[DOCK_SLOT_RIGHT_UL]->get_child_count() - 1, TTR("Scene")); |
There was a problem hiding this comment.
I agree with the fix, though I'm not sure about using get_child_count() -1 to get the right tab.. seems a bit hacky and would break if two docks were on the same slot.
There was a problem hiding this comment.
I have tested this with various dock combinations and everything seemed to work correctly, but I am open to suggestions of better ways to get the tabs.
YeldhamDev
force-pushed
the
translation_layout
branch
from
3b8ba19 to
8987f93
Compare
|
@akien-mga Changes made. Nodes are named in their constructors and the tab indexes are indicated directly by their node's index. |
| dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(scene_tree_dock); | ||
| dock_slot[DOCK_SLOT_RIGHT_UL]->set_tab_title(scene_tree_dock->get_index(), TTR("Scene")); |
There was a problem hiding this comment.
Oh, nice that there was get_index() for this :D
Turns out the problem was that the dock nodes were being named directly using translated strings, and being that layout configurations are saved using the name of the nodes, this caused them to be unrecognizable to any other language besides the one used to create them.
Now, the nodes are always named in english, and the tabs themselves are named after whatever the current language is.
Fixes #10325