Skip to content

Commit 6fead5a

Browse files
LabfoxLabfox
committed
Fix some design issues
1 parent 5040dd3 commit 6fead5a

File tree

4 files changed

+31
-15
lines changed

4 files changed

+31
-15
lines changed

‎bar.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func createBar(nDaemon *notificationDaemon.Daemon) *gtk.Window {
293293
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_LEFT, 0)
294294
layershell.SetMargin(win, layershell.LAYER_SHELL_EDGE_RIGHT, 0)
295295

296-
layershell.SetExclusiveZone(win, 75)
296+
layershell.SetExclusiveZone(win, 50)
297297
layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_NONE)
298298
disp, _ := gdk.DisplayGetDefault()
299299
mon, _ := disp.GetMonitor(0)

‎go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ require (
66
github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc
77
github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046
88
github.com/MiracleOS-Team/desktoplib v0.0.0-20250415145054-8dbe3c9c607b
9-
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250406103953-9a3b3570154b
9+
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250525172408-a1deb8978aaf
1010
github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
11-
github.com/go-git/go-git/v5 v5.15.0
11+
github.com/go-git/go-git/v5 v5.16.0
1212
github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
13-
golang.org/x/text v0.24.0
13+
golang.org/x/text v0.25.0
1414
)
1515

1616
require (
17-
dario.cat/mergo v1.0.1 // indirect
17+
dario.cat/mergo v1.0.2 // indirect
1818
github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect
1919
github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect
2020
github.com/Microsoft/go-winio v0.6.2 // indirect
21-
github.com/ProtonMail/go-crypto v1.2.0 // indirect
21+
github.com/ProtonMail/go-crypto v1.3.0 // indirect
2222
github.com/cli/safeexec v1.0.1 // indirect
2323
github.com/cloudflare/circl v1.6.1 // indirect
2424
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
@@ -43,9 +43,9 @@ require (
4343
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
4444
github.com/skeema/knownhosts v1.3.1 // indirect
4545
github.com/xanzy/ssh-agent v0.3.3 // indirect
46-
golang.org/x/crypto v0.37.0 // indirect
47-
golang.org/x/net v0.39.0 // indirect
48-
golang.org/x/sys v0.32.0 // indirect
46+
golang.org/x/crypto v0.38.0 // indirect
47+
golang.org/x/net v0.40.0 // indirect
48+
golang.org/x/sys v0.33.0 // indirect
4949
google.golang.org/protobuf v1.36.4 // indirect
5050
gopkg.in/ini.v1 v1.67.0 // indirect
5151
gopkg.in/warnings.v0 v0.1.2 // indirect

‎go.sum‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
33
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
44
dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
55
dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
6+
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
7+
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
68
github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 h1:1qlsVAQJXZHsaM8b6OLVo6muQUQd4CwkH/D3fnnbHXA=
79
github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298/go.mod h1:D+QujdIlUNfa0igpNMk6UIvlb6C252URs4yupRUV4lQ=
810
github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g=
@@ -55,12 +57,16 @@ github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301094649-51ce3be1ff64 h1:e3W++m
5557
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250301094649-51ce3be1ff64/go.mod h1:GA/p+ukjyXCsrcpGvs0/gFp1NeHAMtJG/sYT0JcImfE=
5658
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250406103953-9a3b3570154b h1:9rDnd3Y2/1HAP96ivsiuJ+Eerk8+sYiPjGvL1sFBbQc=
5759
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250406103953-9a3b3570154b/go.mod h1:GA/p+ukjyXCsrcpGvs0/gFp1NeHAMtJG/sYT0JcImfE=
60+
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250525172408-a1deb8978aaf h1:Gkc2xnowjpsQabt/15od7YnR+aM54NdF6hI9Cqvx378=
61+
github.com/MiracleOS-Team/libxdg-go v0.0.0-20250525172408-a1deb8978aaf/go.mod h1:GA/p+ukjyXCsrcpGvs0/gFp1NeHAMtJG/sYT0JcImfE=
5862
github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE1FQO4=
5963
github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
6064
github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
6165
github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
6266
github.com/ProtonMail/go-crypto v1.2.0 h1:+PhXXn4SPGd+qk76TlEePBfOfivE0zkWFenhGhFLzWs=
6367
github.com/ProtonMail/go-crypto v1.2.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
68+
github.com/ProtonMail/go-crypto v1.3.0 h1:ILq8+Sf5If5DCpHQp4PbZdS1J7HDFRXz/+xKBiRGFrw=
69+
github.com/ProtonMail/go-crypto v1.3.0/go.mod h1:9whxjD8Rbs29b4XWbB8irEcE8KHMqaR2e7GWU1R+/PE=
6470
github.com/bep/godartsass v1.2.0 h1:E2VvQrxAHAFwbjyOIExAMmogTItSKodoKuijNrGm5yU=
6571
github.com/bep/godartsass v1.2.0/go.mod h1:6LvK9RftsXMxGfsA0LDV12AGc4Jylnu6NgHL+Q5/pE8=
6672
github.com/bep/godartsass/v2 v2.3.2 h1:meuc76J1C1soSCAnlnJRdGqJ5S4m6/GW+8hmOe9tOog=
@@ -104,6 +110,8 @@ github.com/go-git/go-git/v5 v5.14.0 h1:/MD3lCrGjCen5WfEAzKg00MJJffKhC8gzS80ycmCi
104110
github.com/go-git/go-git/v5 v5.14.0/go.mod h1:Z5Xhoia5PcWA3NF8vRLURn9E5FRhSl7dGj9ItW3Wk5k=
105111
github.com/go-git/go-git/v5 v5.15.0 h1:f5Qn0W0F7ry1iN0ZwIU5m/n7/BKB4hiZfc+zlZx7ly0=
106112
github.com/go-git/go-git/v5 v5.15.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
113+
github.com/go-git/go-git/v5 v5.16.0 h1:k3kuOEpkc0DeY7xlL6NaaNg39xdgQbtH5mwCafHO9AQ=
114+
github.com/go-git/go-git/v5 v5.16.0/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8=
107115
github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
108116
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
109117
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -182,6 +190,8 @@ golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
182190
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
183191
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
184192
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
193+
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
194+
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
185195
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
186196
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
187197
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -197,6 +207,8 @@ golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
197207
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
198208
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
199209
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
210+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
211+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
200212
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
201213
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
202214
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -219,6 +231,8 @@ golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
219231
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
220232
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
221233
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
234+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
235+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
222236
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
223237
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
224238
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -228,6 +242,8 @@ golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
228242
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
229243
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
230244
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
245+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
246+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
231247
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
232248
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
233249
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=

‎mainMenu.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ func createAppGroup(apps []desktopFiles.DesktopFile) *gtk.Box {
2222
sc, _ := appBox.GetStyleContext()
2323
sc.AddClass("mm_applist_app")
2424

25-
pixbuf, err := gdk.PixbufNewFromFile(app.Icon) // Replace with your image path
25+
pixbuf, err := gdk.PixbufNewFromFile(app.Icon)
2626
if err == nil {
27-
// Define max size
27+
2828
maxWidth := 16
2929
maxHeight := 16
3030

@@ -169,7 +169,7 @@ func createPowerButtons() *gtk.Box {
169169
func createMainMenu() *gtk.Window {
170170
win, _ := gtk.WindowNew(gtk.WINDOW_TOPLEVEL)
171171
win.SetTitle("Main Menu")
172-
win.SetDefaultSize(600, 600)
172+
173173
win.SetDecorated(false)
174174
win.SetResizable(false)
175175
win.SetTypeHint(gdk.WINDOW_TYPE_HINT_DOCK)
@@ -218,9 +218,9 @@ func createMainMenu() *gtk.Window {
218218
sc, _ = otherTab.GetStyleContext()
219219
sc.AddClass("mm_tab")
220220

221-
appList.SetSizeRequest(300, 600)
222-
fastApps.SetSizeRequest(300, 600)
223-
otherTab.SetSizeRequest(300, 600)
221+
appList.SetSizeRequest(300, 500)
222+
fastApps.SetSizeRequest(300, 500)
223+
otherTab.SetSizeRequest(300, 500)
224224

225225
contentBox.PackStart(appList, false, false, 10)
226226
contentBox.PackStart(fastApps, false, false, 10)

0 commit comments

Comments
 (0)