diff --git a/src/lib/aqdiagram/draw/w_drawable.c b/src/lib/aqdiagram/draw/w_drawable.c index 766b50b..f997378 100644 --- a/src/lib/aqdiagram/draw/w_drawable.c +++ b/src/lib/aqdiagram/draw/w_drawable.c @@ -47,13 +47,6 @@ AQDG_OBJECT *AQDG_DrawableWidget_new(AQDG_OBJECT *parent, uint32_t options, AQDG AQDG_DrawableWidget_Extend(object, drawContext); AQDG_Object_SetOptions(object, options); - AQDG_Object_SetBorderLeft(object, AQDG_DRAWABLE_DEFAULT_BORDER); - AQDG_Object_SetBorderRight(object, AQDG_DRAWABLE_DEFAULT_BORDER); - AQDG_Object_SetBorderTop(object, AQDG_DRAWABLE_DEFAULT_BORDER); - AQDG_Object_SetBorderBottom(object, AQDG_DRAWABLE_DEFAULT_BORDER); - AQDG_Object_SetHSpacing(object, AQDG_DRAWABLE_DEFAULT_HSPACING); - AQDG_Object_SetVSpacing(object, AQDG_DRAWABLE_DEFAULT_VSPACING); - return object; } @@ -75,6 +68,20 @@ void AQDG_DrawableWidget_Extend(AQDG_OBJECT *object, AQDG_DRAW_CONTEXT *drawCont 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)); + AQDG_Object_SetBorderBottom(object, AQDG_Object_GetBorderBottom(parent)); + AQDG_Object_SetHSpacing(object, AQDG_Object_GetHSpacing(parent)); + AQDG_Object_SetVSpacing(object, AQDG_Object_GetVSpacing(parent)); + } + else { + AQDG_Object_SetBorderLeft(object, AQDG_DRAWABLE_DEFAULT_BORDER); + AQDG_Object_SetBorderRight(object, AQDG_DRAWABLE_DEFAULT_BORDER); + AQDG_Object_SetBorderTop(object, AQDG_DRAWABLE_DEFAULT_BORDER); + AQDG_Object_SetBorderBottom(object, AQDG_DRAWABLE_DEFAULT_BORDER); + AQDG_Object_SetHSpacing(object, AQDG_DRAWABLE_DEFAULT_HSPACING); + AQDG_Object_SetVSpacing(object, AQDG_DRAWABLE_DEFAULT_VSPACING); } }