[9front] [PATCH] acme: don't let tag button draw over tag border.

[9front] [PATCH] acme: don't let tag button draw over tag border.

[james palmer]

this fixes the apperance of a 2px wide gap between the edge of the tag
button and the start of the bottom border by making the tag button 2px
less wide rather than shrinking it's rectange after creating the image.

from this plan9port pull request:
https://github.com/9fans/plan9port/pull/490

- james

From: james palmer <james@biobuf.link>
Date: Wed, 06 Oct 2021 09:19:58 +0000
Subject: [PATCH] acme: don't let tag button draw over tag border.

---
diff 6ebb8b9e357944cc29ae3fafc0900ee3e325ed39
2134a2c638e2668f45a92ec814326689cc8089c3
--- a/sys/src/cmd/acme/acme.c	Sun Oct  3 16:58:58 2021
+++ b/sys/src/cmd/acme/acme.c	Wed Oct  6 10:19:58 2021
@@ -895,16 +895,14 @@
 		freeimage(colbutton);
 	}
 
-	r = Rect(0, 0, Scrollwid+2, font->height+1);
+	r = Rect(0, 0, Scrollwid, font->height+1);
 	button = allocimage(display, r, screen->chan, 0, DNofill);
 	draw(button, r, tagcols[BACK], nil, r.min);
-	r.max.x -= 2;
 	border(button, r, 2, tagcols[BORD], ZP);
 
 	r = button->r;
 	modbutton = allocimage(display, r, screen->chan, 0, DNofill);
 	draw(modbutton, r, tagcols[BACK], nil, r.min);
-	r.max.x -= 2;
 	border(modbutton, r, 2, tagcols[BORD], ZP);
 	r = insetrect(r, 2);
 	tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1,
DMedblue);

Re: [9front] [PATCH] acme: don't let tag button draw over tag border.

[igor]

Tested the patch and can confirm it works as advertised. Thanks for
sending it to the list.

Cheers,
Igor


Quoth james palmer <james@biobuf.link>:
> this fixes the apperance of a 2px wide gap between the edge of the tag
> button and the start of the bottom border by making the tag button 2px
> less wide rather than shrinking it's rectange after creating the image.
> 
> from this plan9port pull request:
> https://github.com/9fans/plan9port/pull/490
> 
> - james
> 
> From: james palmer <james@biobuf.link>
> Date: Wed, 06 Oct 2021 09:19:58 +0000
> Subject: [PATCH] acme: don't let tag button draw over tag border.
> 
> ---
> diff 6ebb8b9e357944cc29ae3fafc0900ee3e325ed39
> 2134a2c638e2668f45a92ec814326689cc8089c3
> --- a/sys/src/cmd/acme/acme.c	Sun Oct  3 16:58:58 2021
> +++ b/sys/src/cmd/acme/acme.c	Wed Oct  6 10:19:58 2021
> @@ -895,16 +895,14 @@
>  		freeimage(colbutton);
>  	}
>  
> -	r = Rect(0, 0, Scrollwid+2, font->height+1);
> +	r = Rect(0, 0, Scrollwid, font->height+1);
>  	button = allocimage(display, r, screen->chan, 0, DNofill);
>  	draw(button, r, tagcols[BACK], nil, r.min);
> -	r.max.x -= 2;
>  	border(button, r, 2, tagcols[BORD], ZP);
>  
>  	r = button->r;
>  	modbutton = allocimage(display, r, screen->chan, 0, DNofill);
>  	draw(modbutton, r, tagcols[BACK], nil, r.min);
> -	r.max.x -= 2;
>  	border(modbutton, r, 2, tagcols[BORD], ZP);
>  	r = insetrect(r, 2);
>  	tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1,
> DMedblue);
> 
> 

Re: [9front] [PATCH] acme: don't let tag button draw over tag border.

[ori]

Looks good to me. Committing.

Quoth james palmer <james@biobuf.link>:
> this fixes the apperance of a 2px wide gap between the edge of the tag
> button and the start of the bottom border by making the tag button 2px
> less wide rather than shrinking it's rectange after creating the image.
> 
> from this plan9port pull request:
> https://github.com/9fans/plan9port/pull/490
> 
> - james


> From: james palmer <james@biobuf.link>
> Date: Wed, 06 Oct 2021 09:19:58 +0000
> Subject: [PATCH] acme: don't let tag button draw over tag border.

Just as a heads up, you can just mail this
out directly. rather than doing the email
in an email thing.

	git/export | mail 9front@9front.org

you can also use a diff and write up an
email:

	write email in your favorite client
	git/diff >/dev/snarf
	paste into client

git/import knows how to handle both cases;
the subject+body of the email will become
the commit message, and the patch will be
applied.

	git/import /mail/fs/55153/

maybe we should add a way to add a preamble
or explanatory comment to the email.

> ---
> diff 6ebb8b9e357944cc29ae3fafc0900ee3e325ed39
> 2134a2c638e2668f45a92ec814326689cc8089c3
> --- a/sys/src/cmd/acme/acme.c	Sun Oct  3 16:58:58 2021
> +++ b/sys/src/cmd/acme/acme.c	Wed Oct  6 10:19:58 2021
> @@ -895,16 +895,14 @@
>  		freeimage(colbutton);
>  	}
>  
> -	r = Rect(0, 0, Scrollwid+2, font->height+1);
> +	r = Rect(0, 0, Scrollwid, font->height+1);
>  	button = allocimage(display, r, screen->chan, 0, DNofill);
>  	draw(button, r, tagcols[BACK], nil, r.min);
> -	r.max.x -= 2;
>  	border(button, r, 2, tagcols[BORD], ZP);
>  
>  	r = button->r;
>  	modbutton = allocimage(display, r, screen->chan, 0, DNofill);
>  	draw(modbutton, r, tagcols[BACK], nil, r.min);
> -	r.max.x -= 2;
>  	border(modbutton, r, 2, tagcols[BORD], ZP);
>  	r = insetrect(r, 2);
>  	tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1,
> DMedblue);
> 
> 

Re: [9front] [PATCH] acme: don't let tag button draw over tag border.

[ori]

Quoth igor@9lab.org:
> Tested the patch and can confirm it works as advertised. Thanks for
> sending it to the list.

thanks for testing.