projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some more space for macOS preferences icons.
[dcpomatic.git]
/
src
/
wx
/
html_dialog.cc
diff --git
a/src/wx/html_dialog.cc
b/src/wx/html_dialog.cc
index cce62e1eb6a4291c40de4dc45943e3092c55bb1b..c8138c8cd51cf65b7ca7ac06b9827f32ed4d816a 100644
(file)
--- a/
src/wx/html_dialog.cc
+++ b/
src/wx/html_dialog.cc
@@
-35,7
+35,7
@@
using namespace boost::placeholders;
#endif
#endif
-HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
+HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html
, bool ok
)
: wxDialog (parent, wxID_ANY, title)
{
auto sizer = new wxBoxSizer (wxVERTICAL);
: wxDialog (parent, wxID_ANY, title)
{
auto sizer = new wxBoxSizer (wxVERTICAL);
@@
-52,6
+52,10
@@
HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
h->SetPage (html);
sizer->Add (h, 1, wxEXPAND | wxALL, 6);
h->SetPage (html);
sizer->Add (h, 1, wxEXPAND | wxALL, 6);
+ if (gui_is_dark()) {
+ h->SetHTMLBackgroundColour(*wxBLACK);
+ }
+
h->Bind (wxEVT_HTML_LINK_CLICKED, boost::bind(&HTMLDialog::link_clicked, this, _1));
SetSizer (sizer);
h->Bind (wxEVT_HTML_LINK_CLICKED, boost::bind(&HTMLDialog::link_clicked, this, _1));
SetSizer (sizer);
@@
-62,6
+66,13
@@
HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html)
/* Set height */
SetSize (h->GetInternalRepresentation()->GetWidth(), h->GetInternalRepresentation()->GetHeight() + 256);
/* Set height */
SetSize (h->GetInternalRepresentation()->GetWidth(), h->GetInternalRepresentation()->GetHeight() + 256);
+
+ if (ok) {
+ auto buttons = CreateSeparatedButtonSizer(wxOK);
+ if (buttons) {
+ sizer->Add(buttons, wxSizerFlags().Expand().DoubleBorder());
+ }
+ }
}
}