From b561e5ff77d3067f9ddda355c2456fbc63819a5c Mon Sep 17 00:00:00 2001
From: Brendan Hagan <bhaganksu@gmail.com>
Date: Mon, 20 Jun 2022 00:15:19 -0400
Subject: [PATCH] misc: right align game/style filter, correct help text
 location

---
 data/en.mse-locale/locale |  6 ++++--
 src/gui/new_window.cpp    | 18 +++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index 617022b3..20227ec2 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -212,6 +212,10 @@ help:
 	website:			
 	about:				
 	
+	# New Set Window
+	search game list control: Filter the game list. Use - to exclude games. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
+	search stylesheet list control: Filter the stylesheet list. Use - to exclude styles. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
+
 	# Cards panel
 	collapse notes:		Hide the card notes box
 	expand notes:		Show the card notes box
@@ -462,9 +466,7 @@ label:
 	game type:			&Game type:
 	style type:			&Card style:
 	search game list : Filter Games
-	search game list control: Filter the game list. Use - to exclude games. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 	search stylesheet list: Filter Stylesheets
-	search stylesheet list control: Filter the stylesheet list. Use - to exclude styles. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 	
 	stylesheet not found :
 		The set you are trying to open uses the stylesheet "%s".
diff --git a/src/gui/new_window.cpp b/src/gui/new_window.cpp
index e7a44e12..b5158633 100644
--- a/src/gui/new_window.cpp
+++ b/src/gui/new_window.cpp
@@ -45,15 +45,15 @@ NewSetWindow::NewSetWindow(Window* parent)
   wxSizer* s = new wxBoxSizer(wxVERTICAL);
     wxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
       s2->Add(game_text, 0, wxALL & ~wxLEFT, 4);
-      s2->AddSpacer(2);
-      s2->Add(game_filter, 0, wxALL & ~wxRIGHT, 4);
-    s->Add(s2);
+      s2->AddStretchSpacer();
+      s2->Add(game_filter, 1, wxALIGN_RIGHT, 4);
+    s->Add(s2, wxSizerFlags().Expand().Border(wxALL, 6));
     s->Add(game_list,       0, wxEXPAND | (wxALL & ~wxTOP), 4);
     wxSizer* s3 = new wxBoxSizer(wxHORIZONTAL);
-        s3->Add(stylesheet_text, 0, wxALL & ~wxLEFT, 4);
-        s3->AddSpacer(2);
-        s3->Add(stylesheet_filter, 0, wxALL & ~wxRIGHT, 4);
-    s->Add(s3);
+      s3->Add(stylesheet_text, 0, wxALL & ~wxLEFT, 4);
+      s3->AddStretchSpacer();
+      s3->Add(stylesheet_filter, 1, wxALIGN_RIGHT, 4);
+    s->Add(s3, wxSizerFlags().Expand().Border(wxALL, 6));
     s->Add(stylesheet_list, 0, wxEXPAND | (wxALL & ~wxTOP), 4);
     s->Add(CreateButtonSizer(wxOK | wxCANCEL) , 0, wxEXPAND | wxALL, 8);
     s->SetSizeHints(this);
@@ -61,7 +61,7 @@ NewSetWindow::NewSetWindow(Window* parent)
   // Resize
   Layout();
   wxSize min_size = GetSizer()->GetMinSize() + GetSize() - GetClientSize();
-  SetSize(630,min_size.y);
+  SetSize(830, min_size.y);
   // init lists
   game_list->showData<Game>();
   try {
@@ -84,7 +84,7 @@ void NewSetWindow::onGameSelect(wxCommandEvent&) {
   // resize (yuck)
   Layout();
   wxSize min_size = GetSizer()->GetMinSize() + GetSize() - GetClientSize();
-  SetSize(630,min_size.y);
+  SetSize(830,min_size.y);
 }
 
 void NewSetWindow::onStyleSheetSelect(wxCommandEvent&) {