Change the AIS Target query behavior to be more consistent.

nohal · Feb 16, 2024 · 5895de3 · 5895de3
1 parent 1bf4eb8
commit 5895de3
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/gui/src/AISTargetQueryDialog.cpp b/gui/src/AISTargetQueryDialog.cpp
@@ -197,9 +197,6 @@ bool AISTargetQueryDialog::Create(wxWindow *parent, wxWindowID id,
   //    will not detract from night-vision
 
   long wstyle = AIS_TARGET_QUERY_STYLE;
-  if ((global_color_scheme != GLOBAL_COLOR_SCHEME_DAY) &&
-      (global_color_scheme != GLOBAL_COLOR_SCHEME_RGB))
-    wstyle |= (wxNO_BORDER);
 
   if (!wxFrame::Create(parent, id, caption, pos, size, wstyle)) return false;
 
@@ -215,7 +212,6 @@ bool AISTargetQueryDialog::Create(wxWindow *parent, wxWindowID id,
                                                wxFONTSTYLE_NORMAL,
                                                dFont->GetWeight(), false, face);
 
-  SetFont(*m_basefont);
   m_adjustedFontSize = dFont->GetPointSize();
   m_control_font_size = dFont->GetPointSize();
 
@@ -281,7 +277,8 @@ void AISTargetQueryDialog::CreateControls() {
       new wxHtmlWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                        wxHW_SCROLLBAR_AUTO | wxHW_NO_SELECTION);
   m_pQueryTextCtl->SetBorders(1);
-  topSizer->Add(m_pQueryTextCtl, 1, wxEXPAND, 5);
+  m_pQueryTextCtl->SetFont(*m_basefont);
+  topSizer->Add(m_pQueryTextCtl, 1, wxALL | wxEXPAND, 5);
 
   wxSizer *opt = new wxBoxSizer(wxHORIZONTAL);
   m_createWptBtn = new wxButton(this, xID_WPT_CREATE, _("Create Waypoint"),