Skip to content

Fix #2143: Streamline askChoice dialog window #2311

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.

Sign up for GitHub

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

Open
kellyelton wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #2143: Streamline askChoice dialog window #2311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c562ad5
Fix #2230: Sort sets by release date instead of name
Mar 28, 2026
12a55ac
Fix #2143: Streamline askChoice dialog window
Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion octgnFX/Octgn.JodsEngine/DeckBuilder/SetPropertyDef.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public SetPropertyDef(IEnumerable<Set> allSets)
{
base.Name = "Set";
base.Type = 0;
_allSets = allSets.OrderBy(s => s.Name).ToList();
_allSets = allSets.OrderBy(s => s.ReleaseDate).ToList();
}

public IList<Set> Sets
Expand Down
55 changes: 26 additions & 29 deletions octgnFX/Octgn.JodsEngine/Scripting/Controls/ChoiceDlg.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,21 @@ public ChoiceDlg(string title, string prompt, List<string> choices, List<string>

Title = title;
promptLbl.Text = prompt;
promptLbl.Margin = new Thickness(10, 5, 10, 5);

int count = 0;
foreach (string button in customButtons)
{
count -= 1;
string buttonName = count.ToString();
TextBlock buttonText = new TextBlock();
buttonText.TextWrapping = TextWrapping.Wrap;
buttonText.Margin = new Thickness(10, 5, 10, 5);
buttonText.Margin = new Thickness(8, 3, 8, 3);
buttonText.Text = button;
Button customButton = new Button();
customButton.HorizontalAlignment = HorizontalAlignment.Center;
customButton.Margin = new Thickness(8);
customButton.MinWidth = 50;
customButton.Margin = new Thickness(5);
customButton.MinWidth = 40;
customButton.Content = buttonText;
customButton.Click += Button_Click;
customButton.Uid = buttonName;
Expand All @@ -46,11 +48,11 @@ public ChoiceDlg(string title, string prompt, List<string> choices, List<string>
count += 1;
string buttonName = count.ToString();
TextBlock buttonText = new TextBlock();
buttonText.Margin = new Thickness(10, 5, 10, 5);
buttonText.Margin = new Thickness(8, 3, 8, 3);
buttonText.TextWrapping = TextWrapping.Wrap;
buttonText.Text = choice;
Button button = new Button();
button.Margin = new Thickness(5, 1, 5, 1);
button.Margin = new Thickness(3, 1, 3, 1);
button.Content = buttonText;
if (colors[count - 1] != "None")
{
Expand All @@ -66,30 +68,25 @@ public ChoiceDlg(string title, string prompt, List<string> choices, List<string>

private void CenterWindowInsideOwner()
{
if (Owner != null)
{
double windowWidth = this.ActualWidth;
double windowHeight = this.ActualHeight;
var ownerPosition = new System.Drawing.Point((int)Owner.Left, (int)Owner.Top);
var ownerScreen = System.Windows.Forms.Screen.FromPoint(ownerPosition);
var screenBounds = ownerScreen.Bounds;

if (Owner.WindowState == WindowState.Maximized)
{
this.Left = screenBounds.X + (screenBounds.Width - windowWidth) / 2;
this.Top = screenBounds.Y + (screenBounds.Height - windowHeight) / 2;
}
else
{
double ownerLeft = Owner.Left;
double ownerTop = Owner.Top;
double ownerWidth = Owner.ActualWidth;
double ownerHeight = Owner.ActualHeight;

this.Left = ownerLeft + (ownerWidth - windowWidth) / 2;
this.Top = ownerTop + (ownerHeight - windowHeight) / 2;
}
}
// Position dialog at mouse cursor instead of centering in owner
var helper = new System.Windows.Interop.WindowInteropHelper(this);
var mousePosition = System.Windows.Forms.Control.MousePosition;

this.Left = mousePosition.X - (this.ActualWidth / 2);
this.Top = mousePosition.Y - (this.ActualHeight / 2);

// Ensure dialog stays within screen bounds
var screen = System.Windows.Forms.Screen.FromPoint(mousePosition);
var workingArea = screen.WorkingArea;

if (this.Left < workingArea.Left)
this.Left = workingArea.Left;
if (this.Top < workingArea.Top)
this.Top = workingArea.Top;
if (this.Right > workingArea.Right)
this.Left = workingArea.Right - this.ActualWidth;
if (this.Bottom > workingArea.Bottom)
this.Top = workingArea.Bottom - this.ActualHeight;
}

public int? GetChoice()
Expand Down