diff --git a/Menu/GameShell/10_Settings/About/about.so b/Menu/GameShell/10_Settings/About/about.so index 6cc9d4a..b17eb9e 100644 Binary files a/Menu/GameShell/10_Settings/About/about.so and b/Menu/GameShell/10_Settings/About/about.so differ diff --git a/Menu/GameShell/10_Settings/Settings.so b/Menu/GameShell/10_Settings/Settings.so index 5d5c332..bbad449 100644 Binary files a/Menu/GameShell/10_Settings/Settings.so and b/Menu/GameShell/10_Settings/Settings.so differ diff --git a/Menu/GameShell/10_Settings/Wifi/wifi.so b/Menu/GameShell/10_Settings/Wifi/wifi.so index f682221..b202d39 100644 Binary files a/Menu/GameShell/10_Settings/Wifi/wifi.so and b/Menu/GameShell/10_Settings/Wifi/wifi.so differ diff --git a/Menu/GameShell/HelloWorld/HelloWorld.so b/Menu/GameShell/HelloWorld/HelloWorld.so index d2244ce..6a03855 100644 Binary files a/Menu/GameShell/HelloWorld/HelloWorld.so and b/Menu/GameShell/HelloWorld/HelloWorld.so differ diff --git a/sysgo/UI/keyboard.go b/sysgo/UI/keyboard.go index b2fc3ea..15d45cb 100644 --- a/sysgo/UI/keyboard.go +++ b/sysgo/UI/keyboard.go @@ -95,6 +95,11 @@ type Keyboard struct { func NewKeyboard() *Keyboard { p := &Keyboard{} + p.PageIconMargin = 20 + p.SelectedIconTopOffset = 20 + + p.Align = ALIGN["SLeft"] + p.EasingDur = 10 p.SectionNumbers = 3 @@ -199,7 +204,7 @@ func (self *Keyboard) Init() { start_x = (self.Width-fw- len(self.Secs[i][j])*word_margin)/2+word_margin/2 start_x = start_x + i*self.Width - start_y = 84 * j * (word_margin+14) + start_y = 84 + j * (word_margin+14) for _,val := range self.Secs[i][j] { ti := NewTextItem() @@ -432,11 +437,23 @@ func (self *Keyboard) KeyDown( ev *event.Event) { return } - if ev.Data["Key"] == CurKeys["B"] { + if ev.Data["Key"] == CurKeys["B"] || ev.Data["Key"] == CurKeys["Enter"] { self.ClickOnChar() return } - + + if ev.Data["Key"] == CurKeys["X"] { + if self.SectionIndex <= 0 { + self.LeftOrRight = -1 + } + + if self.SectionIndex >= (self.SectionNumbers - 1) { + self.LeftOrRight = 1 + } + + self.ShiftKeyboardPage() + + } if ev.Data["Key"] == CurKeys["Menu"] { self.ReturnToUpLevelPage() diff --git a/sysgo/UI/text_item.go b/sysgo/UI/text_item.go index 5aee7e0..c128380 100644 --- a/sysgo/UI/text_item.go +++ b/sysgo/UI/text_item.go @@ -32,6 +32,9 @@ type TextItem struct { func NewTextItem() *TextItem { p := &TextItem{} + + p.Align = ALIGN["VCenter"] + p.Color = &color.Color{83,83,83,255} p.MyType = ICON_TYPES["LETTER"] p.Bold = false diff --git a/sysgo/UI/textarea.go b/sysgo/UI/textarea.go index 2690554..d79e6ea 100644 --- a/sysgo/UI/textarea.go +++ b/sysgo/UI/textarea.go @@ -94,7 +94,7 @@ func (self *Textarea) AppendAndBlitText(alphabet string) { } }else { - fmt.Printf("is Full %s",strings.Join(self.MyWords,"")) + fmt.Printf("is Full %s\n",strings.Join(self.MyWords,"")) } }