mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 02:15:43 -04:00
add a horizontal scrollbar too
This commit is contained in:
parent
a5bc4d93a1
commit
7984eecde7
@ -20,17 +20,17 @@
|
|||||||
|
|
||||||
static const wxString
|
static const wxString
|
||||||
self_signed_cert_text =
|
self_signed_cert_text =
|
||||||
_T("This Panda3D application has been signed by what's known as a ")
|
_T("This Panda3D application uses a self-signed certificate. ")
|
||||||
_T("self-signed certificate. This means the name on the certificate can't ")
|
_T("This means the author's name can't be verified, and you have ")
|
||||||
_T("be verified, and you have no way of knowing for sure who wrote it.\n\n")
|
_T("no way of knowing for sure who wrote it.\n\n")
|
||||||
|
|
||||||
_T("We recommend you click Cancel to avoid running this application.");
|
_T("We recommend you click Cancel to avoid running this application.");
|
||||||
|
|
||||||
static const wxString
|
static const wxString
|
||||||
unknown_auth_cert_text =
|
unknown_auth_cert_text =
|
||||||
_T("This Panda3D application has been signed, but we don't recognize ")
|
_T("This Panda3D application has been signed, but we don't recognize ")
|
||||||
_T("the authority that verifies the signature. This means the name ")
|
_T("the authority that verifies the signature. This means the author's ")
|
||||||
_T("on the certificate can't be trusted, and you have no way of knowing ")
|
_T("name can't be trusted, and you have no way of knowing ")
|
||||||
_T("for sure who wrote it.\n\n")
|
_T("for sure who wrote it.\n\n")
|
||||||
|
|
||||||
_T("We recommend you click Cancel to avoid running this application.");
|
_T("We recommend you click Cancel to avoid running this application.");
|
||||||
@ -588,8 +588,8 @@ layout() {
|
|||||||
wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer *vsizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
wxScrolledWindow *slwin = new wxScrolledWindow
|
wxScrolledWindow *slwin = new wxScrolledWindow
|
||||||
(panel, -1, wxDefaultPosition, wxDefaultSize, wxVSCROLL | wxBORDER_SUNKEN);
|
(panel, -1, wxDefaultPosition, wxDefaultSize, wxVSCROLL | wxHSCROLL | wxBORDER_SUNKEN);
|
||||||
slwin->SetScrollRate(0, 20);
|
slwin->SetScrollRate(20, 20);
|
||||||
|
|
||||||
wxBoxSizer *slsizer = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer *slsizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
@ -615,10 +615,9 @@ layout() {
|
|||||||
panel->SetAutoLayout(true);
|
panel->SetAutoLayout(true);
|
||||||
vsizer->Fit(this);
|
vsizer->Fit(this);
|
||||||
|
|
||||||
// Make sure the resulting window is not too wide, and at least a
|
// Make sure the resulting window is at least a certain size.
|
||||||
// certain amount tall.
|
|
||||||
int width, height;
|
int width, height;
|
||||||
GetSize(&width, &height);
|
GetSize(&width, &height);
|
||||||
SetSize(min(width, 600), max(height, 400));
|
SetSize(max(width, 600), max(height, 400));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user