Skip to content

Commit

Permalink
Use new extracted appie library
Browse files Browse the repository at this point in the history
  • Loading branch information
andydotxyz committed Jan 3, 2025
1 parent 354e4c4 commit af48b83
Show file tree
Hide file tree
Showing 47 changed files with 159 additions and 1,262 deletions.
5 changes: 3 additions & 2 deletions cmd/fynedesk/main_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ package main
import (
"log"

"github.com/FyshOS/appie"

"fyne.io/fyne/v2"

"fyshos.com/fynedesk"
"fyshos.com/fynedesk/internal/icon"
"fyshos.com/fynedesk/internal/ui"
"fyshos.com/fynedesk/internal/x11/wm"
)

func setupDesktop(a fyne.App) fynedesk.Desktop {
icons := icon.NewFDOIconProvider()
icons := appie.NewFDOProvider()
mgr, err := wm.NewX11WindowManager(a)
if err != nil {
log.Println("Could not create window manager:", err)
Expand Down
12 changes: 8 additions & 4 deletions desk.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
package fynedesk // import "fyshos.com/fynedesk"

import "fyne.io/fyne/v2"
import (
"fyne.io/fyne/v2"

"github.com/FyshOS/appie"
)

// Desktop defines an embedded or full desktop environment that we can run.
type Desktop interface {
Run()
RunApp(AppData) error
RecentApps() []AppData
RunApp(appie.AppData) error
RecentApps() []appie.AppData
Settings() DeskSettings
ContentBoundsPixels(*Screen) (x, y, w, h uint32)
RootSizePixels() (w, h uint32)
Screens() ScreenList

IconProvider() ApplicationProvider
IconProvider() appie.Provider
WindowManager() WindowManager
Modules() []Module

Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ require (
fyne.io/fyne/v2 v2.5.3-0.20241018190600-e02dad22c257
github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd
github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e
github.com/FyshOS/appie v0.0.0-20250103204932-22db4d5f2ac4
github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184
github.com/Knetic/govaluate v3.0.0+incompatible
github.com/disintegration/imaging v1.6.2
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd h1:u7K2oMFMd8APDV3fM1j2rO3U/XJf1g1qC3DDTKou8iM=
github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/FyshOS/appie v0.0.0-20250103204932-22db4d5f2ac4 h1:lVFM6baY1PmVRonsFcA/GVdpLE9saxamzczc02EjKp4=
github.com/FyshOS/appie v0.0.0-20250103204932-22db4d5f2ac4/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0=
github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 h1:Za0NHFsT0CCXf/X4hEaywjvEECccrM/xVVL8BzAy6JI=
github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184/go.mod h1:cOUmJ3HUVmH3W3u9Gj5hM73ZgrDxGNHKMr5T/sBKqLU=
github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg=
Expand Down
31 changes: 0 additions & 31 deletions icons.go

This file was deleted.

24 changes: 0 additions & 24 deletions internal/icon/cache.go

This file was deleted.

Loading

0 comments on commit af48b83

Please sign in to comment.