From a464acb97cc422cc822ba4d607dba07fd0ba15c9 Mon Sep 17 00:00:00 2001 From: deadwood Date: Thu, 17 Sep 2015 10:43:32 +0000 Subject: [PATCH] Title.mui: minor code cleanup There are only two mode: active and not active git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@51103 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/muimaster/classes/title.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/workbench/libs/muimaster/classes/title.c b/workbench/libs/muimaster/classes/title.c index 8b066158d7..7d434a2b5b 100644 --- a/workbench/libs/muimaster/classes/title.c +++ b/workbench/libs/muimaster/classes/title.c @@ -402,7 +402,7 @@ static void DrawLeftTab(Object *obj, struct Title_DATA *data, BOOL active, } /* Drawing code */ -IPTR Tab__MUIM_Draw(Object *child, struct Title_DATA *data, LONG active) +IPTR Tab__MUIM_Draw(Object *child, struct Title_DATA *data, BOOL active) { WORD x1 = _left(child); WORD y1 = _top(child); @@ -410,18 +410,16 @@ IPTR Tab__MUIM_Draw(Object *child, struct Title_DATA *data, LONG active) WORD y2 = _bottom(child); /* Setting of background (to a different value!) causes redraw of object. We use this "feature" */ - if (active == 1) + if (active) nnset(child, MUIA_Background, data->background); - else if (active == 0) - nnset(child, MUIA_Background, MUII_BACKGROUND); - else if (active == -1) + else nnset(child, MUIA_Background, MUII_BACKGROUND); /* Draw tab frame */ if (data->location == MUIV_Tabs_Top) - DrawTopTab(child, data, (active == 1), x1, y1, x2, y2); + DrawTopTab(child, data, active, x1, y1, x2, y2); else if (data->location == MUIV_Tabs_Left) - DrawLeftTab(child, data, (active == 1), x1, y1, x2, y2); + DrawLeftTab(child, data, active, x1, y1, x2, y2); return TRUE; } @@ -453,11 +451,11 @@ IPTR Title__MUIM_Draw(struct IClass *cl, Object *obj, while ((child = NextObject(&cstate))) { if (tab == data->activetab) - Tab__MUIM_Draw(child, data, 1); + Tab__MUIM_Draw(child, data, TRUE); else if (tab == data->oldactivetab) - Tab__MUIM_Draw(child, data, 0); + Tab__MUIM_Draw(child, data, FALSE); else if (msg->flags & MADF_DRAWOBJECT) - Tab__MUIM_Draw(child, data, -1); + Tab__MUIM_Draw(child, data, FALSE); tab++; } -- 2.11.4.GIT