mirror of
https://github.com/clockworkpi/LauncherGoDev.git
synced 2026-03-19 10:22:41 +01:00
big update, add goroutine sdl render
replace a lot of self.Screen.Draw() to self.Screen.Refresh()
This commit is contained in:
@@ -17,7 +17,7 @@ import (
|
||||
"github.com/cuu/gogame/font"
|
||||
*/
|
||||
"github.com/cuu/gogame/event"
|
||||
"github.com/cuu/gogame/time"
|
||||
//"github.com/cuu/gogame/time"
|
||||
//"github.com/godbus/dbus"
|
||||
//"github.com/muka/go-bluetooth/api"
|
||||
//"github.com/muka/go-bluetooth/bluez"
|
||||
@@ -62,8 +62,7 @@ func (self *BleAgentPairPage) ShowPinCode(device string, pincode string) {
|
||||
if self.Screen.CurPage() != self {
|
||||
self.Screen.PushPage(self)
|
||||
self.ClearCanvas()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
self.Pin = pincode
|
||||
@@ -82,8 +81,7 @@ func (self *BleAgentPairPage) ShowPassKey(device string, passkey uint32, entered
|
||||
if self.Screen.CurPage() != self {
|
||||
self.Screen.PushPage(self)
|
||||
self.ClearCanvas()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
self.Pass = fmt.Sprintf("%06d", passkey)
|
||||
@@ -100,36 +98,24 @@ func (self *BleAgentPairPage) ShowPassKey(device string, passkey uint32, entered
|
||||
|
||||
func (self *BleAgentPairPage) PairOKCb() {
|
||||
self.ClearCanvas()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
self.Screen.MsgBox.SetText("Device paired")
|
||||
self.Screen.MsgBox.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
|
||||
time.BlockDelay(1500)
|
||||
self.Screen.ShowMsg("Device paired",1500)
|
||||
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
self.Screen.FootBar.ResetNavText()
|
||||
|
||||
}
|
||||
|
||||
func (self *BleAgentPairPage) PairErrorCb(err_msg string) {
|
||||
self.ClearCanvas()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
self.Screen.MsgBox.SetText(err_msg)
|
||||
self.Screen.MsgBox.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
|
||||
time.BlockDelay(1500)
|
||||
self.Screen.ShowMsg(err_msg,1500)
|
||||
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
self.Screen.FootBar.ResetNavText()
|
||||
|
||||
}
|
||||
@@ -145,8 +131,7 @@ func (self *BleAgentPairPage) KeyDown(ev *event.Event) {
|
||||
}
|
||||
}
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -62,19 +62,16 @@ func (self *BleForgetConfirmPage) KeyDown(ev *event.Event) {
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["B"] {
|
||||
self.SnapMsg("Deleting")
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
time.BlockDelay(400)
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
}
|
||||
}
|
||||
@@ -310,8 +307,7 @@ func (self *BleInfoPage) TryToForget() {
|
||||
time.BlockDelay(400)
|
||||
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
} else {
|
||||
|
||||
@@ -327,17 +323,14 @@ func (self *BleInfoPage) TryToDisconnect() {
|
||||
if is_connected {
|
||||
|
||||
self.Screen.FootBar.UpdateNavText("Disconnecting")
|
||||
self.Screen.MsgBox.SetText("Disconnecting")
|
||||
self.Screen.MsgBox.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.ShowMsg("Disconnecting",0)
|
||||
|
||||
self.MyDevice.Disconnect()
|
||||
|
||||
time.BlockDelay(350)
|
||||
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
self.Screen.FootBar.ResetNavText()
|
||||
}
|
||||
@@ -369,22 +362,19 @@ func (self *BleInfoPage) KeyDown(ev *event.Event) {
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["A"] || ev.Data["Key"] == UI.CurKeys["Menu"] {
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["Up"] {
|
||||
|
||||
self.ScrollUp()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["Down"] {
|
||||
|
||||
self.ScrollDown()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
if ev.Data["Key"] == UI.CurKeys["Enter"] {
|
||||
self.Click()
|
||||
@@ -512,9 +502,8 @@ func NewBluetoothPage() *BluetoothPage {
|
||||
func (self *BluetoothPage) ShowBox(msg string) {
|
||||
self.MsgBox.Text = msg
|
||||
self.ShowingMessageBox = true
|
||||
self.Screen.Draw()
|
||||
self.MsgBox.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
|
||||
self.Screen.ShowMsg(msg,0)
|
||||
}
|
||||
|
||||
func (self *BluetoothPage) HideBox() {
|
||||
@@ -562,8 +551,7 @@ func (self *BluetoothPage) AbortedAndReturnToUpLevel() {
|
||||
self.HideBox()
|
||||
self.Screen.FootBar.ResetNavText()
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
}
|
||||
|
||||
@@ -816,8 +804,7 @@ func (self *BluetoothPage) KeyDown(ev *event.Event) {
|
||||
|
||||
self.HideBox()
|
||||
self.ReturnToUpLevelPage()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
|
||||
self.Screen.FootBar.ResetNavText()
|
||||
}
|
||||
@@ -825,15 +812,13 @@ func (self *BluetoothPage) KeyDown(ev *event.Event) {
|
||||
if ev.Data["Key"] == UI.CurKeys["Up"] {
|
||||
|
||||
self.ScrollUp()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["Down"] {
|
||||
|
||||
self.ScrollDown()
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["X"] {
|
||||
@@ -854,8 +839,7 @@ func (self *BluetoothPage) KeyDown(ev *event.Event) {
|
||||
self.InfoPage.MyDevice = self.MyList[self.PsIndex].(*NetItem).Device
|
||||
|
||||
self.Screen.PushPage(self.InfoPage)
|
||||
self.Screen.Draw()
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["B"] {
|
||||
|
||||
Reference in New Issue
Block a user