From 2b89350868ec537ba2fdd57ff85a73fb113e7bd6 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 30 Apr 2015 18:04:49 -0400 Subject: [PATCH 1/2] AboutDolphin: Remove unnecessary code --- Source/Core/DolphinWX/AboutDolphin.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index 0ff183c464..8ac4dd8ec3 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -75,15 +75,15 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString SupportText = _("Support"); wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText); - wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_NO_VSCROLL); + wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL); BanishBackground(Revision); wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); - wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_NO_VSCROLL); + wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL); BanishBackground(Branch); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText); - wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, wxString(" | ")); - wxStaticText* const SecondSpacer = new wxStaticText(this, wxID_ANY, wxString(" | ")); + wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, " | "); + wxStaticText* const SecondSpacer = new wxStaticText(this, wxID_ANY, " | "); wxHyperlinkCtrl* const Download = new wxHyperlinkCtrl(this, wxID_ANY, "dolphin-emu.org/download", "https://dolphin-emu.org/download/"); wxHyperlinkCtrl* const License = new wxHyperlinkCtrl(this, wxID_ANY, LicenseText, "https://github.com/dolphin-emu/dolphin/blob/master/license.txt"); wxHyperlinkCtrl* const Authors = new wxHyperlinkCtrl(this, wxID_ANY, AuthorsText, "https://github.com/dolphin-emu/dolphin/graphs/contributors"); @@ -100,13 +100,8 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, RevisionFont.SetWeight(wxFONTWEIGHT_BOLD); Revision->SetFont(RevisionFont); - Revision->SetEditable(false); - Revision->SetWindowStyle(wxNO_BORDER); - BranchFont.SetPointSize(7); Branch->SetFont(BranchFont); - - Branch->SetEditable(false); Branch->AppendText(BranchText + "\n"); Branch->AppendText(BranchRevText + "\n"); Branch->AppendText(CompiledText); From 9012ed18b140ba40e11f8f9501c5cd5e0eaf19b0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 30 Apr 2015 18:07:55 -0400 Subject: [PATCH 2/2] AboutDolphin: Set the multi-line style for branch information Without this, all the branch information would be put on one line, which isn't intended. --- Source/Core/DolphinWX/AboutDolphin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index 8ac4dd8ec3..2adb9823e0 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -78,7 +78,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL); BanishBackground(Revision); wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); - wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL); + wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_READONLY | wxTE_MULTILINE | wxTE_NO_VSCROLL); BanishBackground(Branch); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText);