From da00ee39e4442c6c01049ad81fdfa2a663331475 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Thu, 30 May 2024 23:01:23 +0200 Subject: [PATCH] fixed inheritance of parent properties. --- src/lib/aqdiagram/draw/w_drawable.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/aqdiagram/draw/w_drawable.c b/src/lib/aqdiagram/draw/w_drawable.c index f997378..608cdd5 100644 --- a/src/lib/aqdiagram/draw/w_drawable.c +++ b/src/lib/aqdiagram/draw/w_drawable.c @@ -64,10 +64,12 @@ void AQDG_DrawableWidget_Extend(AQDG_OBJECT *object, AQDG_DRAW_CONTEXT *drawCont xo->drawFn=_drawFallback; parent=AQDG_Object_Tree2_GetParent(object); - if (parent && GWEN_INHERIT_ISOFTYPE(AQDG_OBJECT, AQDG_OBJECT_DRAWABLE, parent)) { - xo->fontId=AQDG_DrawableWidget_GetFontId(parent); - xo->foregroundPenId=AQDG_DrawableWidget_GetForegroundPenId(parent); - xo->backgroundPenId=AQDG_DrawableWidget_GetBackgroundPenId(parent); + if (parent) { + if (GWEN_INHERIT_ISOFTYPE(AQDG_OBJECT, AQDG_OBJECT_DRAWABLE, parent)) { + xo->fontId=AQDG_DrawableWidget_GetFontId(parent); + xo->foregroundPenId=AQDG_DrawableWidget_GetForegroundPenId(parent); + xo->backgroundPenId=AQDG_DrawableWidget_GetBackgroundPenId(parent); + } AQDG_Object_SetBorderLeft(object, AQDG_Object_GetBorderLeft(parent)); AQDG_Object_SetBorderRight(object,AQDG_Object_GetBorderRight(parent)); AQDG_Object_SetBorderTop(object, AQDG_Object_GetBorderTop(parent));