if solid pattern fill is selected globally do solid pattern fills in svg export too.; enforce 24 pixel toolbar button heights, remove border width to gain space.

This commit is contained in:
Stefan Frederik 2022-08-28 22:08:18 +02:00
parent 8be273b9f7
commit 75147ab8cc
2 changed files with 5 additions and 5 deletions

View File

@ -729,13 +729,13 @@ void svg_draw(void)
for(i=0;i<cadlayers;i++){
if(unused_layer[i]) continue;
fprintf(fd, ".l%d{\n", i);
if(xctx->fill_type[i] == 1)
if( xctx->fill_pattern == 0 || xctx->fill_type[i] == 0)
fprintf(fd, " fill: none;\n");
else if( xctx->fill_pattern == 2 || xctx->fill_type[i] == 1)
fprintf(fd, " fill: #%02x%02x%02x;\n", svg_colors[i].red, svg_colors[i].green, svg_colors[i].blue);
else if(xctx->fill_type[i] == 2)
else
fprintf(fd, " fill: #%02x%02x%02x; fill-opacity: 0.5;\n",
svg_colors[i].red, svg_colors[i].green, svg_colors[i].blue);
else
fprintf(fd, " fill: none;\n");
fprintf(fd, " stroke: #%02x%02x%02x;\n", svg_colors[i].red, svg_colors[i].green, svg_colors[i].blue);
fprintf(fd, " stroke-linecap:round;\n");
fprintf(fd, " stroke-linejoin:round;\n");

View File

@ -4301,7 +4301,7 @@ proc toolbar_toolbar { {topwin {} } } {
# Create a tool button which may be displayed
#
proc toolbar_create {name cmd { help "" } {topwin {} } } {
button $topwin.toolbar.b$name -image img$name -relief flat -bd 1 -bg white -fg white \
button $topwin.toolbar.b$name -image img$name -relief flat -bd 0 -bg white -fg white -height 24 \
-padx 0 -pady 0 -command $cmd
if { $help == "" } { balloon $topwin.toolbar.b$name $name } else { balloon $topwin.toolbar.b$name $help }
}