oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from aajonusonline/main

Browse Source 
use `unknown` icon when one is not available
This commit is contained in:
Piotr Miller
2021-09-22 23:09:23 +02:00
committed by GitHub
parent a1bb05c816 0a6fcf6e95
commit 80f8d2eb03
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/nwg-drawer
View File

Binary file not shown.

25
uicomponents.go
View File

@@ -6,6 +6,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
log "github.com/sirupsen/logrus"
"github.com/gotk3/gotk3/gdk" "github.com/gotk3/gotk3/gdk"
"github.com/gotk3/gotk3/gtk" "github.com/gotk3/gotk3/gtk"
) )
@@ -33,13 +34,19 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
btn, _ := gtk.ButtonNew() btn, _ := gtk.ButtonNew()
var pixbuf *gdk.Pixbuf
var img *gtk.Image var img *gtk.Image
var err error
if entry.Icon != "" { if entry.Icon != "" {
pixbuf, _ := createPixbuf(entry.Icon, *iconSize) pixbuf, err = createPixbuf(entry.Icon, *iconSize)
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
} else { } else {
img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID) pixbuf, err = createPixbuf("image-missing", *iconSize)
} }
if err != nil {
log.Error(err)
pixbuf, _ = createPixbuf("unknown", *iconSize)
}
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
btn.SetImage(img) btn.SetImage(img)
btn.SetAlwaysShowImage(true) btn.SetAlwaysShowImage(true)
@@ -233,13 +240,19 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
button, _ := gtk.ButtonNew() button, _ := gtk.ButtonNew()
button.SetAlwaysShowImage(true) button.SetAlwaysShowImage(true)
var pixbuf *gdk.Pixbuf
var img *gtk.Image var img *gtk.Image
var err error
if entry.Icon != "" { if entry.Icon != "" {
pixbuf, _ := createPixbuf(entry.Icon, *iconSize) pixbuf, err = createPixbuf(entry.Icon, *iconSize)
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
} else { } else {
img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID) pixbuf, err = createPixbuf("image-missing", *iconSize)
} }
if err != nil {
log.Error(err)
pixbuf, _ = createPixbuf("unknown", *iconSize)
}
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
button.SetImage(img) button.SetImage(img)
button.SetImagePosition(gtk.POS_TOP) button.SetImagePosition(gtk.POS_TOP)