Skip to content

Yet another attempt to update to latest v2 #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jun 27, 2025
Merged

Yet another attempt to update to latest v2 #314

merged 21 commits into from
Jun 27, 2025

Conversation

tznind
Copy link
Collaborator

@tznind tznind commented Jun 22, 2025

Changes:

  • Remove ColorScheme support
  • Fix namespaces to include all the new ones
  • Switch editor itself to use v2 menus
    • Generated code still uses v1 menus

Manual Testing:
I have tested this by deleting and recreating showcases

Outstanding Issues (will not fix)

  • Setting a menu shortcut leaves remnants after closing - visual clutter on the UI somehow.
    • Create menu
    • Select menu item and hit Ctrl+T (set shortcut)
    • Enter a shortcut
    • See menu closed but left up visual remnant

@tznind tznind marked this pull request as ready for review June 27, 2025 01:01
@tznind tznind requested review from tig and BDisp June 27, 2025 01:02
@tznind
Copy link
Collaborator Author

tznind commented Jun 27, 2025

Ok @tig / @BDisp want to give this a spin?

Last compatible Terminal.Gui package was 4402 back in March so we are overdue a release!

Copy link
Contributor

@BDisp BDisp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done.

@@ -21,18 +24,17 @@ public class DesignState
public DesignState(Design design)
{
this.Design = design;
this.OriginalScheme = this.Design.View.GetExplicitColorScheme();
this.Design.View.DrawComplete += this.DrawContentComplete;
this.Design.View.DrawComplete += this.DrawContentComplete;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format in this line.

src/UI/Editor.cs Outdated
};
rootCommandsListView.SetScheme(new Scheme
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnAddElement.CanFocus = true;
this.btnAddElement.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnAddElement.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnAddElement.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnDelete.CanFocus = true;
this.btnDelete.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnDelete.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnDelete.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnMoveUp.CanFocus = true;
this.btnMoveUp.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnMoveUp.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnMoveUp.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnOk.CanFocus = true;
this.btnOk.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnOk.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnOk.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnCancel.CanFocus = true;
this.btnCancel.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnCancel.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnCancel.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnOk.CanFocus = true;
this.btnOk.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnOk.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnOk.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnCancel.CanFocus = true;
this.btnCancel.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnCancel.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnCancel.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

this.btnCancel.CanFocus = true;
this.btnCancel.ShadowStyle = Terminal.Gui.ShadowStyle.Opaque;
this.btnCancel.Arrangement = Terminal.Gui.ViewBase.ViewArrangement.Fixed;
this.btnCancel.CanFocus = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format here.

@tznind
Copy link
Collaborator Author

tznind commented Jun 27, 2025

Hmn good point, I should open and save all these dialogs that will either fix the problem or show that the problem is in code gen.

@BDisp
Copy link
Contributor

BDisp commented Jun 27, 2025

If it's due code gen it's preferable fix the indention in the code gen.

Copy link

@tig tig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. This was huge.

@tznind tznind merged commit d7d8fb5 into v2 Jun 27, 2025
1 check passed
@tznind tznind deleted the v2-try-again branch June 27, 2025 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants