From ef5523faf5e391982411498e68227e569593a374 Mon Sep 17 00:00:00 2001
From: cuu <gnubsd@me.com>
Date: Tue, 24 Jan 2023 06:55:38 +0000
Subject: [PATCH] re-test

---
 Menu/GameShell/10_Settings/Wifi/wifi.go       |   4 +--
 .../gameshell/titlebar_icons/battery.png      | Bin 0 -> 1274 bytes
 sysgo/UI/title_bar.go                         |  27 +++---------------
 3 files changed, 5 insertions(+), 26 deletions(-)
 create mode 100644 skin/default/sysgo/gameshell/titlebar_icons/battery.png

diff --git a/Menu/GameShell/10_Settings/Wifi/wifi.go b/Menu/GameShell/10_Settings/Wifi/wifi.go
index e13b231..01e84f8 100644
--- a/Menu/GameShell/10_Settings/Wifi/wifi.go
+++ b/Menu/GameShell/10_Settings/Wifi/wifi.go
@@ -407,9 +407,6 @@ func (self *WifiList) ShowBox(msg string) {
 }
 
 func (self *WifiList) HideBox() {
-	self.Draw()
-	self.ShowingMessageBox = false
-	self.Screen.SwapAndShow()
 }
 
 func (self *WifiList) GenNetworkList() {
@@ -739,6 +736,7 @@ func (self *WifiList) KeyDown(ev *event.Event) {
 
 	if ev.Data["Key"] == UI.CurKeys["X"] {
 		self.Rescan(false)
+		self.Screen.Refresh()
 	}
 
 	if ev.Data["Key"] == UI.CurKeys["Y"] {
diff --git a/skin/default/sysgo/gameshell/titlebar_icons/battery.png b/skin/default/sysgo/gameshell/titlebar_icons/battery.png
new file mode 100644
index 0000000000000000000000000000000000000000..12cf126614395b57782b41e7bb02b0696ca875ab
GIT binary patch
literal 1274
zcmeAS@N?(olHy`uVBq!ia0vp^LJSOyVI0grR`5F8)j*0R-O<;Pfnj4m_n$;oAYUQb
zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;`&Dh%)maRn;)|NsB`
z_3Qs@YXM2h0nosq2!P(liXeWuef##jdGqGZo$KS{GhxDnl9H12^z`Y|r&m=~?b@{q
z7=YKVUF+)V`u_d<*|TRqeE4wq@ZtOS?>~S3yu7^p)TvW*=F9;GEYK*R75mB_B?DPW
zB|(0{Aj73<Y9}A~($VPfmOD>jqCeBk<cKG`%^NsWeY7n-G}MIMm=!oB7@dN$WX%sm
zJm1|Q?!a_8{)s1x`m`frF5B5miYH3>-%K{>{K!`XGzDk~&^)l2KtnPQZ@Tz-G0+mm
zByV>Y#{W#Z_kbMs5>H=O_UDWe%my5Lny()M3JD}9`jr7`VEO`MAjQDI8Xb2EsP&Jh
zi(^Q{;kVbrgAX}~v^_j}uX_1SX%4eD3GP6qxl+@OsUKeV?tXmcou$%?2#+VbYxE{P
zo$F)L;xfapyr`;b(PhpOHP3XWx!xtuWhx~rS$BPiW%|U<)TlkN#!*w^L*>D(2CVDz
z4?JCZ+q%O2<v*c`_uF3_?B|&GZ{kH|cmMMx{u3WfRM}$g<>~9oI7N(WDd!ZqMc&Uf
zngiWJPMvX@GM8D?oIkKG$Wc+@=^WP&QI<zlJG?H+o<6l$ZfjE@tNYZ@lBrH}%7xTc
z)n#8jaao$D%7Jb1MTLfw9_f!xoH-#gbyc>&)oYHc@*S>t%<^fNQfziO`|8#$Tqzr)
zZs&xpZdKl`v%UPprr0IdKVCVxVzP3y_}t!_x>u`i=}r(je(^GQwdJpXL*MFpLuC(y
zW(OR4<>=zPVbx_*pA#LYXReTn4qcvIl5>Z(%6Gys&wxX|Cq%q%824tlJr13^{Z0@2
z-lu7@AI#64RgUrq>2*2vQhfRa{wO!j@G!x(D|fA`uD#2f;XKWp<wi>Roj*Tf-cO#k
zT5a*(i`Tw=6I(F1pu&B@U4y%N?$tftOq_rBe6zH&SYj>k=mY2fciIlROV+J#h*vu;
zDEs5L#O>2uliK$(+C2FjTpaq`Q1*xTw`|V;&R5^pJo%S-Rle?tNw}$=oaNcj-foNf
zz^}{qGhK0t|G`zksQRX1My&L=gTUmVTH+c}l9E`GYL#4+3Zxi}42+C*4GeV+%tH(f
utqcsUOpLV+46F<cSlPaqqG-s?PsvQH#I2zu+NTq!fx*+&&t;ucLK6UMFWSEV

literal 0
HcmV?d00001

diff --git a/sysgo/UI/title_bar.go b/sysgo/UI/title_bar.go
index 4ce9165..2d67b61 100644
--- a/sysgo/UI/title_bar.go
+++ b/sysgo/UI/title_bar.go
@@ -293,7 +293,6 @@ func (self *TitleBar) SetSoundVolume(vol int) {
 func (self *TitleBar) CheckBatteryStat() {
 	bat_segs := [][]int{[]int{0, 6}, []int{7, 15}, []int{16, 20}, []int{21, 30}, []int{31, 50}, []int{51, 60}, []int{61, 80}, []int{81, 90}, []int{91, 100}}
 
-	self.Icons["battery"] = self.Icons["battery_unknown"]
 
 	if FileExists(sysgo.Battery) == false {
 		return
@@ -340,11 +339,9 @@ func (self *TitleBar) CheckBatteryStat() {
 
 	if val, ok := bat_uevent["POWER_SUPPLY_STATUS"]; ok {
 		if val == "Charging" {
-			self.Icons["battery_charging"].SetIconIndex(cap_ge)
-			self.Icons["battery"] = self.Icons["battery_charging"]
+			self.Icons["battery"].SetIconIndex(1+cap_ge)
 		} else {
-			self.Icons["battery_discharging"].SetIconIndex(cap_ge)
-			self.Icons["battery"] = self.Icons["battery_discharging"]
+			self.Icons["battery"].SetIconIndex(1+9+cap_ge)
 		}
 	}
 
@@ -392,29 +389,13 @@ func (self *TitleBar) Init(main_screen *MainScreen) {
 
 	self.Icons["wifistatus"] = icon_wifi_status
 
-	battery_charging := NewTitleBarIconItem()
-	battery_charging.MyType = ICON_TYPES["STAT"]
-	battery_charging.Parent = self
-	battery_charging.ImageName = self.icon_base_path + "withcharging.png"
-	battery_charging.Adjust(start_x+self.IconWidth+self.IconWidth+8, self.IconHeight/2+(self.BarHeight-self.IconHeight)/2, self.IconWidth, self.IconHeight, 0)
-
-	self.Icons["battery_charging"] = battery_charging
-
-	battery_discharging := NewTitleBarIconItem()
-	battery_discharging.MyType = ICON_TYPES["STAT"]
-	battery_discharging.Parent = self
-	battery_discharging.ImageName = self.icon_base_path + "without_charging.png"
-	battery_discharging.Adjust(start_x+self.IconWidth+self.IconWidth+8, self.IconHeight/2+(self.BarHeight-self.IconHeight)/2, self.IconWidth, self.IconHeight, 0)
-
-	self.Icons["battery_discharging"] = battery_discharging
-
 	battery_unknown := NewTitleBarIconItem()
 	battery_unknown.MyType = ICON_TYPES["STAT"]
 	battery_unknown.Parent = self
-	battery_unknown.ImageName = self.icon_base_path + "battery_unknown.png"
+	battery_unknown.ImageName = self.icon_base_path + "battery.png"
 	battery_unknown.Adjust(start_x+self.IconWidth+self.IconWidth+8, self.IconHeight/2+(self.BarHeight-self.IconHeight)/2, self.IconWidth, self.IconHeight, 0)
 
-	self.Icons["battery_unknown"] = battery_unknown
+	self.Icons["battery"] = battery_unknown
 
 	self.CheckBatteryStat()