From: Dana Jansens Date: Thu, 14 Jan 2010 21:19:57 +0000 (-0500) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=3bd4397b6ec5212bfe53a36892746962dc45dbeb;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: openbox/frame.c --- 3bd4397b6ec5212bfe53a36892746962dc45dbeb diff --cc openbox/frame.c index 084f3f6a,67adb405..8835c632 --- a/openbox/frame.c +++ b/openbox/frame.c @@@ -861,10 -862,12 +861,12 @@@ void frame_adjust_area(ObFrame *self, g if (focus_cycle_target == self->client) focus_cycle_update_indicator(self->client); } - if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR)) + if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR) && + self->label_width) + { - XResizeWindow(ob_display, self->label, self->label_width, + XResizeWindow(obt_display, self->label, self->label_width, ob_rr_theme->label_height); - + } } static void frame_adjust_cursors(ObFrame *self)