comparison src/toolbar-common.c @ 905:c15f25529e61

[xemacs-hg @ 2002-07-06 21:05:42 by andyp] toolbar redisplay patch
author andyp
date Sat, 06 Jul 2002 21:05:58 +0000
parents 79c6ff3eef26
children 51a17f29fab3
comparison
equal deleted inserted replaced
904:47c30044fc4e 905:c15f25529e61
394 \ 394 \
395 if (tb->x != x \ 395 if (tb->x != x \
396 || tb->y != y \ 396 || tb->y != y \
397 || tb->width != width \ 397 || tb->width != width \
398 || tb->height != height \ 398 || tb->height != height \
399 || tb->dirty) \ 399 || tb->dirty \
400 || f->clear) /* This is clearly necessary. */ \
400 { \ 401 { \
401 if (width && height) \ 402 if (width && height) \
402 { \ 403 { \
403 tb->x = x; \ 404 tb->x = x; \
404 tb->y = y; \ 405 tb->y = y; \
610 { 611 {
611 __INTERNAL_APPROPRIATENESS_CHECK(f); 612 __INTERNAL_APPROPRIATENESS_CHECK(f);
612 613
613 if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) 614 if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
614 common_output_toolbar (f, TOP_TOOLBAR); 615 common_output_toolbar (f, TOP_TOOLBAR);
615 else if (f->top_toolbar_was_visible)
616 common_clear_toolbar (f, TOP_TOOLBAR, 0);
617 616
618 if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) 617 if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
619 common_output_toolbar (f, BOTTOM_TOOLBAR); 618 common_output_toolbar (f, BOTTOM_TOOLBAR);
620 else if (f->bottom_toolbar_was_visible)
621 common_clear_toolbar (f, BOTTOM_TOOLBAR, 0);
622 619
623 if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) 620 if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
624 common_output_toolbar (f, LEFT_TOOLBAR); 621 common_output_toolbar (f, LEFT_TOOLBAR);
625 else if (f->left_toolbar_was_visible)
626 common_clear_toolbar (f, LEFT_TOOLBAR, 0);
627 622
628 if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) 623 if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
629 common_output_toolbar (f, RIGHT_TOOLBAR); 624 common_output_toolbar (f, RIGHT_TOOLBAR);
630 else if (f->right_toolbar_was_visible) 625 }
626
627 void
628 common_clear_frame_toolbars (struct frame *f)
629 {
630 __INTERNAL_APPROPRIATENESS_CHECK(f);
631
632 if (f->top_toolbar_was_visible
633 && !FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
634 common_clear_toolbar (f, TOP_TOOLBAR, 0);
635 if (f->bottom_toolbar_was_visible
636 && !FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
637 common_clear_toolbar (f, BOTTOM_TOOLBAR, 0);
638 if (f->left_toolbar_was_visible
639 && !FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
640 common_clear_toolbar (f, LEFT_TOOLBAR, 0);
641 if (f->right_toolbar_was_visible
642 && !FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
631 common_clear_toolbar (f, RIGHT_TOOLBAR, 0); 643 common_clear_toolbar (f, RIGHT_TOOLBAR, 0);
632 } 644 }
633 645
634 static void 646 static void
635 common_redraw_exposed_toolbar (struct frame *f, enum toolbar_pos pos, int x, int y, 647 common_redraw_exposed_toolbar (struct frame *f, enum toolbar_pos pos, int x, int y,