From 9ce234a53317c1b21a60ad208d74ed803823ada7 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 3 Oct 2009 09:59:27 +0200 Subject: [PATCH] awful.widget.tasklist: use symbols chars rather than images Signed-off-by: Julien Danjou --- lib/awful/widget/tasklist.lua.in | 16 +++++++--------- themes/default/tasklist/floating.png | Bin 345 -> 0 bytes themes/default/tasklist/floatingw.png | Bin 334 -> 0 bytes themes/default/theme.lua.in | 2 -- themes/sky/theme.lua.in | 1 - themes/zenburn/theme.lua.in | 1 - 6 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 themes/default/tasklist/floating.png delete mode 100644 themes/default/tasklist/floatingw.png diff --git a/lib/awful/widget/tasklist.lua.in b/lib/awful/widget/tasklist.lua.in index 66b69faa..90ee8136 100644 --- a/lib/awful/widget/tasklist.lua.in +++ b/lib/awful/widget/tasklist.lua.in @@ -34,19 +34,17 @@ local function tasklist_label(c, args) local bg_urgent = args.bg_urgent or theme.tasklist_bg_urgent or theme.bg_urgent local fg_minimize = args.fg_minimize or theme.tasklist_fg_minimize or theme.fg_minimize local bg_minimize = args.bg_minimize or theme.tasklist_bg_minimize or theme.bg_minimize - local floating_icon = args.floating_icon or theme.tasklist_floating_icon local font = args.font or theme.tasklist_font or theme.font or "" local bg = nil local text = "" - local name - local status_image - if client.floating.get(c) and floating_icon then - status_image = capi.image(floating_icon) - end + local name = "" + if client.floating.get(c) then name = name .. "✈" end + if c.maximized_horizontal then name = name .. '⬌' end + if c.maximized_vertical then name = name .. "⬍" end if c.minimized then - name = util.escape(c.icon_name) or util.escape(c.name) or util.escape("") + name = name .. util.escape(c.icon_name) or util.escape(c.name) or util.escape("") else - name = util.escape(c.name) or util.escape("") + name = name .. util.escape(c.name) or util.escape("") end if capi.client.focus == c then bg = bg_focus @@ -65,7 +63,7 @@ local function tasklist_label(c, args) text = text .. name end text = text .. "" - return text, bg, status_image, c.icon + return text, bg, nil, c.icon end local function tasklist_update(s, w, buttons, filter, data, style, template) diff --git a/themes/default/tasklist/floating.png b/themes/default/tasklist/floating.png deleted file mode 100644 index f29e7f5a9a88b2792344da49b01b69d947002ee4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~g!2%@3w~L7bDaPU;cPEB*=VV?2Ih+L^k;M!Q z+`=Ht$S`Y;1W=H@#M9T6{RTTHmlEFw9?wpokYtH#M2T~LZfo z*92^Mer#4?rRwc>IUX9fi*!GyTvy>Vwu-CSxnbQ4_sH9e1***6{uVjZJgtzqwEbP{ z1#zbxr3qo@=FB_OE^se(Ug(o6F_z`8Zp;pMKR4&aEHeW&Q`OMRMJux-udd=;DY*Yl k#Fiy5<3D>`d0N99QfGYPmE_VDKtC{ey85}Sb4q9e0NKlaX8-^I diff --git a/themes/default/tasklist/floatingw.png b/themes/default/tasklist/floatingw.png deleted file mode 100644 index eb802aeebfd3632131a4f00e3fa2e934d5306c54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~g!2%@3w~L7bDaPU;cPEB*=VV?2Ih+L^k;M!Q z+`=Ht$S`Y;1W=H@#M9T6{RTTHmmFv8?4?(MLXst}5hc#~xw)x%B@E6*sfi`2DGKG8 zB^e6tp1uL$jeH=JnUcKST^JZv^(q?yd22mg977}|OAi`qw=goWJ@_t>60~WSh}hwi zS^Mh`6inP?AhB+<=k`r^7wiyimQOU5I6w_xk2}(ah#ma(7lPOE}mUT5V=(TeUgS_w=T=nLS0%9K4nPZ(N%cW2?IV X(dwl}PXAwnyusk<>gTe~DWM4fUetK} diff --git a/themes/default/theme.lua.in b/themes/default/theme.lua.in index 0e8cf751..05ad43cd 100644 --- a/themes/default/theme.lua.in +++ b/themes/default/theme.lua.in @@ -35,8 +35,6 @@ theme.border_marked = "#91231c" theme.taglist_squares_sel = "@AWESOME_THEMES_PATH@/default/taglist/squarefw.png" theme.taglist_squares_unsel = "@AWESOME_THEMES_PATH@/default/taglist/squarew.png" -theme.tasklist_floating_icon = "@AWESOME_THEMES_PATH@/default/tasklist/floatingw.png" - -- Variables set for theming the menu: -- menu_[bg|fg]_[normal|focus] -- menu_[border_color|border_width] diff --git a/themes/sky/theme.lua.in b/themes/sky/theme.lua.in index aa16cdbe..01713d61 100644 --- a/themes/sky/theme.lua.in +++ b/themes/sky/theme.lua.in @@ -36,7 +36,6 @@ theme.layout_tile = "@AWESOME_THEMES_PATH@/sky/layouts/tile.png" theme.layout_tiletop = "@AWESOME_THEMES_PATH@/sky/layouts/tiletop.png" theme.awesome_icon = "@AWESOME_THEMES_PATH@/sky/awesome-icon.png" -theme.tasklist_floating_icon = "@AWESOME_THEMES_PATH@/sky/layouts/floating.png" -- from default for now... theme.menu_submenu_icon = "@AWESOME_THEMES_PATH@/default/submenu.png" diff --git a/themes/zenburn/theme.lua.in b/themes/zenburn/theme.lua.in index d1287f4d..0ee2ce20 100644 --- a/themes/zenburn/theme.lua.in +++ b/themes/zenburn/theme.lua.in @@ -79,7 +79,6 @@ theme.taglist_squares_unsel = "@AWESOME_THEMES_PATH@/zenburn/taglist/squarez.png -- {{{ Misc theme.awesome_icon = "@AWESOME_THEMES_PATH@/zenburn/awesome-icon.png" theme.menu_submenu_icon = "@AWESOME_THEMES_PATH@/default/submenu.png" -theme.tasklist_floating_icon = "@AWESOME_THEMES_PATH@/default/tasklist/floatingw.png" -- }}} -- {{{ Layout