1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- utils/vlaunch/vlaunch.cpp.orig 2022-12-31 03:37:54 UTC
+++ utils/vlaunch/vlaunch.cpp
@@ -145,7 +145,7 @@ VMain::VMain()
wxNotebook* nbook = new wxNotebook(panel, -1, wxPoint(0, 105), wxSize(447, 270));
mainsizer->Add(nbook);
- wxPanel* page = new wxPanel(nbook);
+ wxScrolledWindow* page = new wxScrolledWindow(nbook);
nbook->AddPage(page, wxT("Main"));
wxFlexGridSizer* gsizer = new wxFlexGridSizer(2);
@@ -185,12 +185,17 @@ VMain::VMain()
gsizer->Add(EditMisc, 0, wxALL, 4);
page->SetSizer(gsizer);
gsizer->Layout();
+ gsizer->FitInside(page);
+ page->SetScrollRate(10, 10);
// Video options
- page = new wxPanel(nbook);
+ page = new wxScrolledWindow(nbook);
nbook->AddPage(page, wxT("Video"));
wxFlexGridSizer* vsizer = new wxFlexGridSizer(2);
+ vsizer->Add(new wxStaticText(page, -1, wxT(" ")), 0, wxALL, 4);
+ vsizer->Add(new wxStaticText(page, -1, wxT(" ")), 0, wxALL, 4);
+
vsizer->Add(new wxStaticText(page, -1, wxT("Renderer:")), 0, wxALL, 4);
wxString RendChoices[2];
RendChoices[0] = wxT("OpenGL");
@@ -237,9 +242,11 @@ VMain::VMain()
vsizer->Add(Particles, 0, wxALL, 4);
page->SetSizer(vsizer);
vsizer->Layout();
+ vsizer->FitInside(page);
+ page->SetScrollRate(10, 10);
// Sound options
- page = new wxPanel(nbook);
+ page = new wxScrolledWindow(nbook);
nbook->AddPage(page, wxT("Sound"));
wxFlexGridSizer* ssizer = new wxFlexGridSizer(2);
@@ -272,9 +279,11 @@ VMain::VMain()
ssizer->Add(PatchFiles, 0, wxALL, 4);
page->SetSizer(ssizer);
ssizer->Layout();
+ ssizer->FitInside(page);
+ page->SetScrollRate(10, 10);
// Input options
- page = new wxPanel(nbook);
+ page = new wxScrolledWindow(nbook);
nbook->AddPage(page, wxT("Input"));
wxFlexGridSizer* isizer = new wxFlexGridSizer(2);
@@ -297,9 +306,11 @@ VMain::VMain()
isizer->Add(MouseY, 0, wxALL, 4);
page->SetSizer(isizer);
isizer->Layout();
+ isizer->FitInside(page);
+ page->SetScrollRate(10, 10);
// Network options
- page = new wxPanel(nbook);
+ page = new wxScrolledWindow(nbook);
nbook->AddPage(page, wxT("Network"));
gsizer = new wxFlexGridSizer(2);
gsizer->AddSpacer(1);
@@ -331,6 +342,8 @@ VMain::VMain()
gsizer->Add(EditMasterIPAddress, 0, wxALL, 4);
page->SetSizer(gsizer);
gsizer->Layout();
+ gsizer->FitInside(page);
+ page->SetScrollRate(10, 10);
wxBoxSizer* bsizer = new wxBoxSizer(wxHORIZONTAL);
bsizer->Add(new wxButton(panel, VLaunch_Run, wxT("Run")), 0, wxALL, 4);
|
