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

use unknown icon when one is not available

Browse Source
This commit is contained in:
wtl
2021-09-22 14:51:16 +03:00
parent a1bb05c816
commit 54e880df47
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/nwg-drawer
View File

Binary file not shown.

33
uicomponents.go
View File

@@ -6,10 +6,25 @@ 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"
) )
func getImageFromIcon(ico string) (img *gtk.Image, err error) {
var pixbuf *gdk.Pixbuf
if ico != "" {
pixbuf, err = createPixbuf(ico, *iconSize)
} else {
pixbuf, err = createPixbuf("image-missing", *iconSize)
}
if err != nil {
pixbuf, _ = createPixbuf("unknown", *iconSize)
}
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
return
}
func setUpPinnedFlowBox() *gtk.FlowBox { func setUpPinnedFlowBox() *gtk.FlowBox {
if pinnedFlowBox != nil { if pinnedFlowBox != nil {
pinnedFlowBox.Destroy() pinnedFlowBox.Destroy()
@@ -33,12 +48,9 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
btn, _ := gtk.ButtonNew() btn, _ := gtk.ButtonNew()
var img *gtk.Image img, err := getImageFromIcon(entry.Icon)
if entry.Icon != "" { if err != nil {
pixbuf, _ := createPixbuf(entry.Icon, *iconSize) log.Error(err)
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
} else {
img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
} }
btn.SetImage(img) btn.SetImage(img)
@@ -233,12 +245,9 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
button, _ := gtk.ButtonNew() button, _ := gtk.ButtonNew()
button.SetAlwaysShowImage(true) button.SetAlwaysShowImage(true)
var img *gtk.Image img, err := getImageFromIcon(entry.Icon)
if entry.Icon != "" { if err != nil {
pixbuf, _ := createPixbuf(entry.Icon, *iconSize) log.Error(err)
img, _ = gtk.ImageNewFromPixbuf(pixbuf)
} else {
img, _ = gtk.ImageNewFromIconName("image-missing", gtk.ICON_SIZE_INVALID)
} }
button.SetImage(img) button.SetImage(img)