diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | iconsupport.patch | 8 |
3 files changed, 12 insertions, 12 deletions
@@ -1,6 +1,6 @@ pkgbase = i3-wm-iconpatch pkgdesc = An improved dynamic tiling window manager (with titlebar icon patch) - pkgver = 4.17.1 + pkgver = 4.18.1 pkgrel = 1 url = http://i3wm.org/ arch = i686 @@ -29,13 +29,13 @@ pkgbase = i3-wm-iconpatch conflicts = i3-wm options = docs options = !strip - source = http://i3wm.org/downloads/i3-4.17.1.tar.bz2 - source = http://i3wm.org/downloads/i3-4.17.1.tar.bz2.asc + source = http://i3wm.org/downloads/i3-4.18.1.tar.bz2 + source = http://i3wm.org/downloads/i3-4.18.1.tar.bz2.asc source = iconsupport.patch validpgpkeys = 424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D - sha1sums = 1834ce349a2aea2fbb0d44d9ed820fa9e1a394ab + sha1sums = 7a9d3fb235ca9916065751b9bfe2307c25875e7c sha1sums = SKIP - sha1sums = d314df1acdd30d9297aaf7b2c1956908f0152d2c + sha1sums = a5bcc549ef1e429485d9f247b4ed20dde6f88a8a pkgname = i3-wm-iconpatch @@ -7,7 +7,7 @@ pkgname=i3-wm-iconpatch _pkgsourcename=i3 -pkgver=4.17.1 +pkgver=4.18.1 pkgrel=1 pkgdesc='An improved dynamic tiling window manager (with titlebar icon patch)' arch=('i686' 'x86_64') @@ -29,9 +29,9 @@ options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2" "http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc" "iconsupport.patch") -sha1sums=('1834ce349a2aea2fbb0d44d9ed820fa9e1a394ab' +sha1sums=('7a9d3fb235ca9916065751b9bfe2307c25875e7c' 'SKIP' - 'd314df1acdd30d9297aaf7b2c1956908f0152d2c') + 'a5bcc549ef1e429485d9f247b4ed20dde6f88a8a') validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg prepare() { diff --git a/iconsupport.patch b/iconsupport.patch index f6df6e4cbb24..085f66398677 100644 --- a/iconsupport.patch +++ b/iconsupport.patch @@ -158,9 +158,9 @@ index 790baba..cc88ee7 100644 DLOG("Managing window 0x%08x\n", window); @@ -177,6 +180,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki - window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL), true); - window_update_name_legacy(cwindow, xcb_get_property_reply(conn, title_cookie, NULL), true); - window_update_name(cwindow, xcb_get_property_reply(conn, utf8_title_cookie, NULL), true); + window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL)); + window_update_name_legacy(cwindow, xcb_get_property_reply(conn, title_cookie, NULL)); + window_update_name(cwindow, xcb_get_property_reply(conn, utf8_title_cookie, NULL)); + window_update_icon(cwindow, xcb_get_property_reply(conn, wm_icon_cookie, NULL)); window_update_leader(cwindow, xcb_get_property_reply(conn, leader_cookie, NULL)); window_update_transient_for(cwindow, xcb_get_property_reply(conn, transient_cookie, NULL)); @@ -284,7 +284,7 @@ index 790baba..cc88ee7 100644 const int deco_width = (int)con->deco_rect.width; + + /* Draw the icon */ -+ if (win->icon) { ++ if (win && win->icon) { + uint16_t icon_size = con->deco_rect.height - 2 * logical_px(1); + + int icon_offset_y = (con->deco_rect.height - icon_size) / 2; |