From 2f09d8b99f4a38d0409024ae7c13f6a644f23aa1 Mon Sep 17 00:00:00 2001 From: tadam Date: Mon, 16 Aug 2010 14:43:07 +0000 Subject: [PATCH] Use the correct border hints to calculate screen width. When calculating the size of the FvwmTaskBar, ensure we get the information from the newer border size hints, and don't use the old one. This fixes an incredibly long-standing bug in FvwmTaskBar. I hope I win a prize. :) --- NEWS | 3 +++ modules/ChangeLog | 9 +++++++++ modules/FvwmTaskBar/FvwmTaskBar.c | 4 ++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 595151253..c47b3aa51 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,9 @@ Changes in beta release 2.5.32 (not released yet) * Bug fixes: + - Fix width of FvwmTaskBar to fit on screen properly by using the correct + module information to determine the border size. + ------------------------------------------------------------------- ------------------------------------------------------------------- diff --git a/modules/ChangeLog b/modules/ChangeLog index 5c372b3fc..c1a3740e4 100644 --- a/modules/ChangeLog +++ b/modules/ChangeLog @@ -1,3 +1,12 @@ +2010-08-16 Thomas Adam + * FvwmTasBar/FvwmTaskBar.c (ProcessMessage): + Use the correct border hints to calculate screen width. + + When calculating the size of the FvwmTaskBar, ensure we get the + information from the newer border size hints, and don't use the old one. + This fixes an incredibly long-standing bug in FvwmTaskBar. I hope I win + a prize. :) + 2010-08-06 Chris Siebenmann * FvwmIconMan/fvwm.c (count_nonsticky_in_hashtable): Correctly handle iconified windows with sticky icons. diff --git a/modules/FvwmTaskBar/FvwmTaskBar.c b/modules/FvwmTaskBar/FvwmTaskBar.c index 93be2f014..0366bbbd8 100644 --- a/modules/FvwmTaskBar/FvwmTaskBar.c +++ b/modules/FvwmTaskBar/FvwmTaskBar.c @@ -489,8 +489,8 @@ void ProcessMessage(unsigned long type,unsigned long *body) int nth; nb = (short)cfgpacket->border_width; - nw = screen_g.width - (win_border<<1); - nh = (int)cfgpacket->frame_height - (win_border<<1); + nw = screen_g.width - (nb<<1); + nh = (int)cfgpacket->frame_height - (nb<<1); nht = HAS_TITLE(cfgpacket); ntd = GET_TITLE_DIR(cfgpacket); nth = (int)cfgpacket->title_height; -- 2.11.4.GIT