Verified Commit 27b2d1c0 authored by Bernd Paysan's avatar Bernd Paysan
Browse files

Different render mode if setstring$ is set

parent 91df9ca4

minos2/actors.fs

+6 −5
Original line number Diff line number Diff line
@@ -646,8 +646,9 @@ Defer anim-ins 


[IFDEF] android also android also jni [THEN]

: setstring> ( max span addr pos1 - max span addr pos2 )

    setstring$ $@len 0> xselw 0> and  IF  edit-cut  THEN

    setstring$ $@ xins-string  setstring$ $free edit-update

    setstring$ $@len 0> xselw 0> and  IF

	edit-cut drop  setstring$ $@ xins-string  setstring$ $free

    THEN  edit-update

    [IFDEF] restartkb restartkb [THEN] ;



: edit-paste ( max span addr pos1 - max span addr pos2 false )
@@ -778,10 +779,10 @@ edit-terminal edit-out ! 
    [: 2rot prefix-off edit-ins$ edit-update +sync +resize ;] edit-xt ; edit-actor is ukeyed

:noname ( o:actor -- )

    ['] setstring> edit-xt edit-w >o -1 to cursize o> +sync

    -keyboard ; edit-actor is defocus

; edit-actor is defocus

:noname ( o:actor -- )

    edit-w >o  0 to cursize o> +sync

    +keyboard ; edit-actor is focus

    edit-w >o  0 to cursize o> +sync +keyboard

; edit-actor is focus

:noname ( $rxy*n bmask -- )

    case

	dup 1 u<= ?of drop  expand-selection  endof

minos2/widgets.fs

+4 −4
Original line number Diff line number Diff line
@@ -653,18 +653,18 @@ $3F7FFF7F text-color, FValue selection-color 
: edit-text ( -- )

    w text-w text-scale! edit-marking

    text-xy!

    cursize 0= setstring$ $@len and IF

    setstring$ $@len IF

	text$ curpos umin render-string

	setstring$ $@ 1 render-us-string

	text$ curpos safe/string render-string

	text$ curpos cursize 0 max + safe/string render-string

    ELSE

	text$ start end text$-part render-string

    THEN ;

: edit-!size ( -- )

    text-font to font

    cursize 0= setstring$ $@len and IF

    setstring$ $@len IF

	[: text$ curpos umin type setstring$ $.

	    text$ curpos safe/string type ;] $tmp

	    text$ curpos cursize 0 max + safe/string type ;] $tmp

    ELSE

	text$

    THEN  start end text$-part layout-string