X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=b028364fdeb4131f8755da432c750dca8b8f3439;hb=9c925fe76f2f2b3ad74251b775e938b80c81195d;hp=2a78b901c5f6e84f29604532567fa8c132a876f4;hpb=ba30b2aedd9a673be5c23ebb2c5f25a4616daaa5;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 2a78b901..b028364f 100644 --- a/src/editor.c +++ b/src/editor.c @@ -3406,8 +3406,10 @@ static void DrawPropertiesConfig() else DrawElementContentAreas(); } +#if 1 else if (IS_CUSTOM_ELEMENT(properties_element)) DrawCustomChangedArea(); +#endif } if (IS_GEM(properties_element)) @@ -3639,7 +3641,7 @@ static void DrawPropertiesTabulatorGadgets() struct GadgetDesign *gd = &gd_gi->alt_design[GD_BUTTON_UNPRESSED]; int gd_x = gd->x + gd_gi->border.width / 2; int gd_y = gd->y + gd_gi->height - 1; - Pixel line_color = GetPixel(gd->bitmap, gd_x, gd_y); + Pixel tab_color = GetPixel(gd->bitmap, gd_x, gd_y); int id_first = ED_TEXTBUTTON_ID_PROPERTIES_INFO; int id_last = ED_TEXTBUTTON_ID_PROPERTIES_INFO; int i; @@ -3657,19 +3659,23 @@ static void DrawPropertiesTabulatorGadgets() int gadget_id = textbutton_info[i].gadget_id; struct GadgetInfo *gi = level_editor_gadget[gadget_id]; boolean active = (i != edit_mode_properties); - Pixel color = (active ? BLACK_PIXEL : line_color); - /* draw solid or black line below tabulator button */ - FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width, 1, color); + /* draw background line below tabulator button */ + ClearRectangleOnBackground(drawto, gi->x, gi->y + gi->height, gi->width,1); + + /* draw solid line below inactive tabulator buttons */ + if (!active && tab_color != BLACK_PIXEL) /* black => transparent */ + FillRectangle(drawto, gi->x, gi->y + gi->height, gi->width,1, tab_color); ModifyGadget(gi, GDI_ACTIVE, active, GDI_END); MapTextbuttonGadget(i); } /* draw little border line below tabulator buttons */ - FillRectangle(drawto, gd_gi->x, gd_gi->y + gd_gi->height + 1, - 3 * gd_gi->width + 2 * ED_GADGET_DISTANCE, ED_GADGET_DISTANCE, - line_color); + if (tab_color != BLACK_PIXEL) /* black => transparent */ + FillRectangle(drawto, gd_gi->x, gd_gi->y + gd_gi->height + 1, + 3 * gd_gi->width + 2 * ED_GADGET_DISTANCE, + ED_GADGET_DISTANCE, tab_color); } static void DrawPropertiesInfo()