From: Carl Hetherington <cth@carlh.net>
Date: Thu, 10 Sep 2020 23:23:58 +0000 (+0200)
Subject: DirPicker tweaks:
X-Git-Tag: v2.15.102~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=44dde2ee811eb35535633d760e6c0671cdf45cae

DirPicker tweaks:
  - fix vertical padding so that folder name lines up with label.
  - use italic for the folder name.
  - use the full path for the folder name.
---

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 289316820..0a7b7a943 100644
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -39,7 +39,10 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
 	_sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	_folder = new StaticText (this, wxT(""));
-	_sizer->Add (_folder, 1, wxEXPAND | wxALL, 6);
+	wxFont font = _folder->GetFont ();
+	font.SetStyle (wxFONTSTYLE_ITALIC);
+	_folder->SetFont (font);
+	_sizer->Add (_folder, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
 	_browse = new Button (this, _("Browse..."));
 	_sizer->Add (_browse, 0);
 
@@ -56,7 +59,7 @@ DirPickerCtrl::SetPath (wxString p)
 	if (_path == wxStandardPaths::Get().GetDocumentsDir()) {
 		_folder->SetLabel (_("My Documents"));
 	} else {
-		_folder->SetLabel (std_to_wx (filesystem::path (wx_to_std (_path)).leaf().string()));
+		_folder->SetLabel (_path);
 	}
 
 	wxCommandEvent ev (wxEVT_DIRPICKER_CHANGED, wxID_ANY);