From 007cf34c5640e5058663ca14f8dd04f81a454955 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Tue, 29 Nov 2022 03:08:28 -0500 Subject: [PATCH] Making use of the baller ass new highlighting style --- draw.go | 2 ++ go.mod | 2 +- go.sum | 4 ++-- keyboard.xcf | Bin 359693 -> 362692 bytes tree.go | 18 ++++++++++++------ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/draw.go b/draw.go index e51343a..2b943ba 100644 --- a/draw.go +++ b/draw.go @@ -60,8 +60,10 @@ func drawInput () { if character == '_' { application.SetColor(x + xOffset, y, stone.ColorDim) + application.SetStyle(x + xOffset, y, stone.StyleNormal) } else { application.SetColor(x + xOffset, y, cell.Color()) + application.SetStyle(x + xOffset, y, cell.Style()) } } } diff --git a/go.mod b/go.mod index 2c4c704..8489575 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module git.tebibyte.media/sashakoshka/mathpan go 1.19 -require git.tebibyte.media/sashakoshka/stone v0.2.1 +require git.tebibyte.media/sashakoshka/stone v0.5.1 require ( github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect diff --git a/go.sum b/go.sum index 9f44c83..3271d8d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.tebibyte.media/sashakoshka/stone v0.2.1 h1:qUvuYpl0yN2bY50vXazvH2s6EMvk8IFgvr8QiiA8xvc= -git.tebibyte.media/sashakoshka/stone v0.2.1/go.mod h1:ISnqmX6xvItOot3eW3YWLcNFeJrGpKetQGQniAjnU2A= +git.tebibyte.media/sashakoshka/stone v0.5.1 h1:QQo1lccq6bMebXRKlbAoFBKSDbVwvSkXriKHMGvfAkk= +git.tebibyte.media/sashakoshka/stone v0.5.1/go.mod h1:ISnqmX6xvItOot3eW3YWLcNFeJrGpKetQGQniAjnU2A= github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 h1:1qlsVAQJXZHsaM8b6OLVo6muQUQd4CwkH/D3fnnbHXA= github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298/go.mod h1:D+QujdIlUNfa0igpNMk6UIvlb6C252URs4yupRUV4lQ= github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 h1:lTG4HQym5oPKjL7nGs+csTgiDna685ZXjxijkne828g= diff --git a/keyboard.xcf b/keyboard.xcf index d228a4278fe4366f91a6955768267facb2ab72f7..ab9d71f36ae30ec8d0429cb3c08f2a2994d81694 100644 GIT binary patch delta 6103 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 delta 2985 zcmZve3s6->7{|}qd(H)KRw8+;!hW*f;U9iu^i1?>3=7#0H#*bhcs2Zx!!5jVlH9^m*V;G_ZI)DST3ZE#)-aA6~u znI|S%eF27|i(tuPuv83Go(26YE4bemJX{UdtOidefajlq-=7Ar3*OoQ{oZkdCaGaN zOD8q0Xb1mQ?3BlL*=qp;4B3ZEeTBrTc&?}Uo*r@~+va(|ET_@=cK2q&WnaNH4|zK) zwEMbxiI*_O==a|-ynmzh-X5|md+hC^w9_YR$E(b1i{zAq3CVW4osgEd#sxSiIv?KJ}kGF>%u5nf7iy zX@AeIBLY%*A4hRaB_23nEgU_E3666FaynvpGe9hG;1?n;l9Db@iK&p@@A`+1(}4zd zcGtm{_3)DkX=KH{z}+EWbss;uJ!zCu#E%d5KCf?JQ0XmB7iRk)gOK2dv?xNegt);K zHjo~Puv$X8LhY}z`iNB)TlfjlQ%5kbdboJC@SAjbk(Go$V>_Z-s3h`rdSHZRi4-G5 zeM{>{SS^v!dQVA;I$AOEM}-Utpmk$3ZAc`nhU~(nC-fl+tmW87B`9X3li#1WTk$HU zjhXQZA2-D;Wx*5nnSw@r=;ZIs+ZwN;?)DECZy8#DOQrOnDt2UG6yAYbqejr+aA1%X%a;u z7!eL1R}!zWoV4R+lDd&bXJ{n#5Qn?U9jTYtXBm}dGAo~kW^2B)_82{-d15?68^Wbn z;#uO*%pK0Mv$wgDta&s#*PZsub+Ke^MAwCPxXEhCIwsW4Y+7!$Ys8X8&<#0|OZ|=z zvn(lvFV8u>9WmUsMBEE`gIW6OM`l}o4dM;?zr4z?H}Wd~G22=+)P)obqR&b+OF=4n z6n#V6Z?akn@`ZYYg>KqqCdK{euRAoYc&yX7`lZN^vR;a3vUf_YE@VqC4XMzAw^YJh zs^=arrFt$n$~xW<-L}-jSlU9+&X!jkGLy3Pba0iXl^uZDkajNhH07o2Vo7$DN-8eV z4Tt`{x+)sEW+lwRst(1gq;e|ts?oH{9CR^cCoaV{Rc>U_HP;k!Fq3vZsc8qrHDZKy z;8IUaUJf!Ae=-oG;!W>%XSW((m~0Q6*U!fN`c8`Vdl0?yk(E5)>-Q*(kcYcy>=P~X;eBI3 zHRHPAFM@x8bM;S+D5h)td$I<~@9E%keUrG^h5K}R?F0Q|!QM!BISTX0qnpE?^tr)I zIqd}u3y`XEKK4~!dlUA}+2HO#u-XEi-2&E)2OG-37bb(m4R&HX1HH?~U?^?_@{zte zQl>;=7sHWw4xBR{%=r#n69;au0xR$(AXS3LSHXVvC3sc;@=6l9lLR&{1e?wpG`(g( zGFeyiMy4d0Y$xFGg~#+>N9cWUm`#J4ppPC6Cg9F7C7pskU(Y!{PF^8cSOAu|fu;Mw zJy*dadfxE(Q+zx=zht_&7lxn2#P@bV|I-_M@zkKwEE4ow0NSyqN{@2reL}&3SW#u9 zFZ79X!5MjAmSEluV}3~~dKZozNH*n5(eWsjRyjW%{u}GS+hJgX#h@x9hg4U*q3VVl zP`ygv?@$YN+y{2T2SWAE(cfQ^RG&1^Hx~56-$=FZeCXkSgONXgareN9x53HrU=ngh zog(xp+h9+{6``hLCDhbv*r)YEvZ&Jr3xl2%{DG$9qE=@XL7%06gSdTm5STtE+ox%f RPm|0m;nlR)r%746^dFJs^F#mu diff --git a/tree.go b/tree.go index b4745f3..806b657 100644 --- a/tree.go +++ b/tree.go @@ -232,19 +232,22 @@ func (operation *Operation) Render (target stone.Buffer, offset int) (moved int) } if selectedExpression == operation { - target.SetColor(offset, 0, stone.ColorBlue) + target.SetColor(offset, 0, stone.ColorYellow) + target.SetStyle(offset, 0, stone.StyleHighlight) } else { target.SetColor(offset, 0, stone.ColorDim) + target.SetStyle(offset, 0, stone.StyleNormal) } moved ++ opcodeSymbol := operation.opcode.String() for _, character := range opcodeSymbol { target.SetRune(offset + moved, 0, character) + target.SetColor(offset + moved, 0, stone.ColorYellow) if selectedExpression == operation { - target.SetColor(offset + moved, 0, stone.ColorBlue) + target.SetStyle(offset + moved, 0, stone.StyleHighlight) } else { - target.SetColor(offset + moved, 0, stone.ColorYellow) + target.SetStyle(offset + moved, 0, stone.StyleNormal) } moved ++ } @@ -262,9 +265,11 @@ func (operation *Operation) Render (target stone.Buffer, offset int) (moved int) } if selectedExpression == operation { - target.SetColor(offset + moved, 0, stone.ColorBlue) + target.SetColor(offset + moved, 0, stone.ColorYellow) + target.SetStyle(offset + moved, 0, stone.StyleHighlight) } else { target.SetColor(offset + moved, 0, stone.ColorDim) + target.SetStyle(offset + moved, 0, stone.StyleNormal) } moved ++ return @@ -362,10 +367,11 @@ func (literal *IntegerLiteral) Render (target stone.Buffer, offset int) (moved i for _, character := range output { target.SetRune(offset + moved, 0, character) + target.SetColor(offset + moved, 0, stone.ColorPurple) if selectedExpression == literal { - target.SetColor(offset + moved, 0, stone.ColorBlue) + target.SetStyle(offset + moved, 0, stone.StyleHighlight) } else { - target.SetColor(offset + moved, 0, stone.ColorPurple) + target.SetStyle(offset + moved, 0, stone.StyleNormal) } moved ++ }