Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make button and searchctrl pages in widgets sample more DPI aware

Browse Source
This commit is contained in:
Maarten Bent
2019-11-03 17:20:37 +01:00
parent 8c0c3cc2b9
commit 0e335b9dc1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/widgets/button.cpp
View File

@@ -312,7 +312,7 @@ void ButtonWidgetsPage::CreateContent()
sizerLeft->AddSpacer(5); sizerLeft->AddSpacer(5);
wxButton *btn = new wxButton(this, ButtonPage_Reset, "&Reset"); wxButton *btn = new wxButton(this, ButtonPage_Reset, "&Reset");
sizerLeft->Add(btn, wxSizerFlags().CentreHorizontal().Border(wxALL, 15)); sizerLeft->Add(btn, wxSizerFlags().CentreHorizontal().TripleBorder(wxALL));
// middle pane // middle pane
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, "&Operations"); wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, "&Operations");
@@ -337,15 +337,15 @@ void ButtonWidgetsPage::CreateContent()
// right pane // right pane
m_sizerButton = new wxBoxSizer(wxHORIZONTAL); m_sizerButton = new wxBoxSizer(wxHORIZONTAL);
m_sizerButton->SetMinSize(150, 0); m_sizerButton->SetMinSize(FromDIP(150), 0);
// the 3 panes panes compose the window // the 3 panes panes compose the window
sizerTop->Add(sizerLeft, sizerTop->Add(sizerLeft,
wxSizerFlags(0).Expand().Border((wxALL & ~wxLEFT), 10)); wxSizerFlags(0).Expand().DoubleBorder(wxALL & ~wxLEFT));
sizerTop->Add(sizerMiddle, sizerTop->Add(sizerMiddle,
wxSizerFlags(1).Expand().Border(wxALL, 10)); wxSizerFlags(1).Expand().DoubleBorder(wxALL));
sizerTop->Add(m_sizerButton, sizerTop->Add(m_sizerButton,
wxSizerFlags(1).Expand().Border((wxALL & ~wxRIGHT), 10)); wxSizerFlags(1).Expand().DoubleBorder((wxALL & ~wxRIGHT)));
// do create the main control // do create the main control
Reset(); Reset();

10
samples/widgets/searchctrl.cpp
View File

@@ -156,13 +156,13 @@ void SearchCtrlWidgetsPage::CreateContent()
m_searchBtnCheck->SetValue(true); m_searchBtnCheck->SetValue(true);
box->Add(m_searchBtnCheck, 0, wxALL, 5); box->Add(m_searchBtnCheck, wxSizerFlags().Border());
box->Add(m_cancelBtnCheck, 0, wxALL, 5); box->Add(m_cancelBtnCheck, wxSizerFlags().Border());
box->Add(m_menuBtnCheck, 0, wxALL, 5); box->Add(m_menuBtnCheck, wxSizerFlags().Border());
wxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(box, 0, wxALL|wxEXPAND, 15); sizer->Add(box, wxSizerFlags().Expand().TripleBorder());
sizer->Add(m_srchCtrl, 0, wxALL|wxALIGN_CENTER, 15); sizer->Add(m_srchCtrl, wxSizerFlags().Centre().TripleBorder());
SetSizer(sizer); SetSizer(sizer);
} }