diff --git a/main.go b/main.go index ef06171..7284698 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,8 @@ func run() int { display.Init() font.Init() screen := display.SetMode(int32(UI.Width),int32(UI.Height),0,32) - + + UI.Init() UI.MyIconPool.Init() main_screen := UI.NewMainScreen() diff --git a/sysgo/UI/UI.go b/sysgo/UI/UI.go new file mode 100644 index 0000000..6e24714 --- /dev/null +++ b/sysgo/UI/UI.go @@ -0,0 +1,48 @@ +package UI + +import ( + + "fmt" + + "github.com/veandco/go-sdl2/ttf" + + "github.com/cuu/gogame/font" + "github.com/cuu/LauncherGo/sysgo" +) + + +func Init() { + font.Init() + + skinpath := "skin/"+sysgo.SKIN+"/truetype" + + Fonts = make(map[string]*ttf.Font) + + fonts_path := make(map[string]string) + + + fonts_path["varela"] = fmt.Sprintf("%s/VarelaRound-Regular.ttf",skinpath) + fonts_path["veramono"] = fmt.Sprintf("%s/VeraMono.ttf",skinpath) + fonts_path["noto"] = fmt.Sprintf("%s/NotoSansMono-Regular.ttf", skinpath) + fonts_path["notocjk"] = fmt.Sprintf("%s/NotoSansCJK-Regular.ttf" ,skinpath) + + for i:=12;i<41;i++ { + keyname := fmt.Sprintf("varela%d",i) + Fonts[ keyname ] = font.Font(fonts_path["varela"],i) + } + + for i:=10;i<26;i++ { + keyname := fmt.Sprintf("veramono%d", i) + Fonts[keyname] = font.Font(fonts_path["veramono"],i) + } + + for i:= 10;i<18;i++ { + keyname := fmt.Sprintf("notosansmono%d", i) + Fonts[keyname] = font.Font(fonts_path["noto"], i) + } + + for i:=10;i<18;i++ { + keyname := fmt.Sprintf("notosanscjk%d",i) + Fonts[keyname] = font.Font(fonts_path["notocjk"],i) + } +} diff --git a/sysgo/UI/fonts.go b/sysgo/UI/fonts.go index d3802e0..d09dcac 100644 --- a/sysgo/UI/fonts.go +++ b/sysgo/UI/fonts.go @@ -1,51 +1,8 @@ package UI - -import ( - - "fmt" - - "github.com/veandco/go-sdl2/ttf" - - "github.com/cuu/gogame/font" - "github.com/cuu/LauncherGo/sysgo" +import( + "github.com/veandco/go-sdl2/ttf" ) - var Fonts map[string]*ttf.Font -func init() { - font.Init() - - skinpath := "skin/"+sysgo.SKIN+"/truetype" - - Fonts = make(map[string]*ttf.Font) - - fonts_path := make(map[string]string) - - - fonts_path["varela"] = fmt.Sprintf("%s/VarelaRound-Regular.ttf",skinpath) - fonts_path["veramono"] = fmt.Sprintf("%s/VeraMono.ttf",skinpath) - fonts_path["noto"] = fmt.Sprintf("%s/NotoSansMono-Regular.ttf", skinpath) - fonts_path["notocjk"] = fmt.Sprintf("%s/NotoSansCJK-Regular.ttf" ,skinpath) - - for i:=12;i<41;i++ { - keyname := fmt.Sprintf("varela%d",i) - Fonts[ keyname ] = font.Font(fonts_path["varela"],i) - } - - for i:=10;i<26;i++ { - keyname := fmt.Sprintf("veramono%d", i) - Fonts[keyname] = font.Font(fonts_path["veramono"],i) - } - - for i:= 10;i<18;i++ { - keyname := fmt.Sprintf("notosansmono%d", i) - Fonts[keyname] = font.Font(fonts_path["noto"], i) - } - - for i:=10;i<18;i++ { - keyname := fmt.Sprintf("notosanscjk%d",i) - Fonts[keyname] = font.Font(fonts_path["notocjk"],i) - } -}