Page DropDown with icons #527
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -109,29 +109,35 @@ private void BuildContents(ImGui gui) { | |||||
| private void PageRightClickDropdown(ImGui gui, ProjectPage page) { | ||||||
| bool isSecondary = screen.secondaryPage == page; | ||||||
| bool isActive = screen.activePage == page; | ||||||
| if (gui.BuildContextMenuButton(LSs.EditPageProperties, icon:Icon.Edit)) { | ||||||
|
There was a problem hiding this comment.
Suggested change
Our code style calls for spaces here, and missing spaces will cause problems for those of us who are using the recommended pre-push hook. |
||||||
| _ = gui.CloseDropdown(); | ||||||
| ProjectPageSettingsPanel.Show(page); | ||||||
| } | ||||||
| if (!isSecondary && !isActive) { | ||||||
| if (gui.BuildContextMenuButton(LSs.OpenSecondaryPage, LSs.ShortcutCtrlClick, Icon.Secondary)) { | ||||||
| _ = gui.CloseDropdown(); | ||||||
| screen.SetSecondaryPage(page); | ||||||
| } | ||||||
| } | ||||||
| else if (isSecondary) { | ||||||
| if (gui.BuildContextMenuButton(LSs.CloseSecondaryPage, LSs.ShortcutCtrlClick, Icon.Close)) { | ||||||
| _ = gui.CloseDropdown(); | ||||||
| screen.SetSecondaryPage(null); | ||||||
| } | ||||||
| } | ||||||
| if (gui.BuildContextMenuButton(LSs.DuplicatePage, icon:Icon.Copy)) { | ||||||
| _ = gui.CloseDropdown(); | ||||||
| if (ProjectPageSettingsPanel.ClonePage(page) is { } copy) { | ||||||
| screen.project.RecordUndo().pages.Add(copy); | ||||||
| MainScreen.Instance.SetActivePage(copy); | ||||||
| } | ||||||
| } | ||||||
| if (gui.BuildContextMenuButton(LSs.RemovePage, icon:Icon.Delete, disabled: !page.canDelete)) { | ||||||
|
There was a problem hiding this comment.
Suggested change
For consistency with ProjectPageSettingsPanel, this should probably use the same string. |
||||||
| _ = gui.CloseDropdown(); | ||||||
| if (page.canDelete) { | ||||||
| screen.project.RemovePage(page); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| public void Build(ImGui gui) { | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even if we do want separate strings (Factorio has four "Cancel"s and three "Back"s in English), they should probably have the same content, to avoid questions about the differences between 'remove' and 'delete'.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. We can reuse the
delete-pageinstead.