From 2f5c1db63c55173d15a7ab17a9b75564fabd3648 Mon Sep 17 00:00:00 2001 From: Markus Ongyerth Date: Wed, 13 Jun 2018 07:00:57 +0200 Subject: refactor lib/ui/tab to ensure staying in bounds Fix a few potential out of bounds by placing proper checks, which should be relevant if all tabs are removed for some reason. Also avoid iterating all tabs in the invalidate handler, since we are only interested in whether it's the selected tab either way --- lib/ui/tab.go | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/lib/ui/tab.go b/lib/ui/tab.go index f18b0ac..8f08978 100644 --- a/lib/ui/tab.go +++ b/lib/ui/tab.go @@ -40,14 +40,13 @@ func (tabs *Tabs) Add(content Drawable, name string) { } func (tabs *Tabs) invalidateChild(d Drawable) { - for i, tab := range tabs.Tabs { - if tab.Content == d { - if i == tabs.Selected { - if tabs.onInvalidateContent != nil { - tabs.onInvalidateContent(tabs.TabContent) - } - } - return + if tabs.Selected >= len(tabs.Tabs) { + return + } + + if tabs.Tabs[tabs.Selected].Content == d { + if tabs.onInvalidateContent != nil { + tabs.onInvalidateContent(tabs.TabContent) } } } @@ -59,10 +58,18 @@ func (tabs *Tabs) Remove(content Drawable) { break } } + /* Force the selected index into the existing range */ + if tabs.Selected >= len(tabs.Tabs) { + tabs.Select(len(tabs.Tabs) - 1) + } tabs.TabStrip.Invalidate() } func (tabs *Tabs) Select(index int) { + if tabs.Selected >= len(tabs.Tabs) { + panic("Tried to set tab index to a non-existing element") + } + if tabs.Selected != index { tabs.Selected = index tabs.TabStrip.Invalidate() @@ -101,6 +108,12 @@ func (strip *TabStrip) OnInvalidate(onInvalidate func(d Drawable)) { } func (content *TabContent) Draw(ctx *Context) { + if content.Selected >= len(content.Tabs) { + width := ctx.Width() + height := ctx.Height() + ctx.Fill(0, 0, width, height, ' ', tcell.StyleDefault) + } + tab := content.Tabs[content.Selected] tab.Content.Draw(ctx) } -- cgit 1.4.1-2-gfad0 ut type='hidden' name='id' value='a50a95d21505148035ec8f08af414d663e9dad7e'/>
path: root/092socket.mu
blob: b0dca4b7577f0f273b57f0f10e5f6c9161820b2b (plain) (tree) 
9da067db ^

d154c121 ^

9da067db ^


d7e48920 ^

9da067db ^




01ce563d ^

9da067db ^






01ce563d ^

9da067db ^





87eb3aca ^

d7e48920 ^

9da067db ^


d7e48920 ^

4a48bedc ^

f116818c ^

d7e48920 ^


7d07cd1d ^

b1f0fa4d ^




















9da067db ^


87eb3aca ^

d7e48920 ^

4a48bedc ^

9da067db ^




a65a32ae ^

9da067db ^



87eb3aca ^

d7e48920 ^


300a1d6e ^

f24eeaab ^

4a48bedc ^

f24eeaab ^

4a48bedc ^

9da067db ^




0606f4ac ^


294b2ab3 ^

f24eeaab ^


0606f4ac ^







5eb5a8de ^

f24eeaab ^




4a48bedc ^

f24eeaab ^








87eb3aca ^

62ae069e ^

4a48bedc ^

62ae069e ^

28191d31 ^

b07576d2 ^


28191d31 ^


b07576d2 ^


28191d31 ^

62ae069e ^

b07576d2 ^


62ae069e ^

b07576d2 ^

62ae069e ^


5eb5a8de ^


87eb3aca ^

5eb5a8de ^

4a48bedc ^

5eb5a8de ^

87eb3aca ^

62ae069e ^


f24eeaab ^

62ae069e ^

4a48bedc ^

62ae069e ^






f24eeaab ^

62ae069e ^




300a1d6e ^




4a48bedc ^

300a1d6e ^



























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
79

80

81
82

83
84
85
86
87
88
89

90

91
92
93
94

95

96
97
98
99
100
101
102
103

104

105

106

107

108

109
110

111
112

113
114

115

116

117
118

119

120

121
122

123
124

125

126

127

128

129

130
131

132

133

134

135
136
137
138
139
140

141

142
143
144
145

146
147
148
149

150

151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177