equal
deleted
inserted
replaced
583 evView ~~ field ifTrue:[ |
583 evView ~~ field ifTrue:[ |
584 (evView isSameOrComponentOf:field) ifFalse:[ |
584 (evView isSameOrComponentOf:field) ifFalse:[ |
585 ^ false |
585 ^ false |
586 ]. |
586 ]. |
587 point := x @ y. |
587 point := x @ y. |
588 point := device translatePoint:point fromView:evView toView:field. |
588 point := self graphicsDevice translatePoint:point fromView:evView toView:field. |
589 x := point x. |
589 x := point x. |
590 y := point y. |
590 y := point y. |
591 ]. |
591 ]. |
592 (x between:0 and:field width) ifFalse:[^ false]. |
592 (x between:0 and:field width) ifFalse:[^ false]. |
593 (y between:0 and:field height) ifFalse:[^ false]. |
593 (y between:0 and:field height) ifFalse:[^ false]. |
789 opensMenu := ((list notEmptyOrNil or:[comboMenuHolder notNil]) |
789 opensMenu := ((list notEmptyOrNil or:[comboMenuHolder notNil]) |
790 and:[self enableChannel value]). |
790 and:[self enableChannel value]). |
791 |
791 |
792 opensMenu ifTrue:[ |
792 opensMenu ifTrue:[ |
793 menu := self createPullDownMenuForList:list. |
793 menu := self createPullDownMenuForList:list. |
794 origin := device translatePoint:(0 @ self height) fromView:self toView:nil. |
794 origin := self graphicsDevice translatePoint:(0 @ self height) fromView:self toView:nil. |
795 "/ menu extentChangedFlag:false. |
795 "/ menu extentChangedFlag:false. |
796 "/ menu originChangedFlag:false. |
796 "/ menu originChangedFlag:false. |
797 menu showAt:origin resizing:false. |
797 menu showAt:origin resizing:false. |
798 ]. |
798 ]. |
799 |
799 |
886 ]. |
886 ]. |
887 |
887 |
888 list isNil ifTrue:[ |
888 list isNil ifTrue:[ |
889 menuPrefX := menuPrefY := 0 |
889 menuPrefX := menuPrefY := 0 |
890 ] ifFalse:[ |
890 ] ifFalse:[ |
891 m := (MenuView onDevice:(device notNil ifTrue:[device] ifFalse:[Screen current])) labels:list. |
891 |graphicsDevice| |
|
892 |
|
893 graphicsDevice := self graphicsDevice ? Screen current. |
|
894 m := (MenuView onDevice:graphicsDevice) labels:list. |
892 menuPrefX := m preferredWidth. |
895 menuPrefX := m preferredWidth. |
893 |
896 |
894 "/ the menuView returns rubbish ... |
897 "/ the menuView returns rubbish ... |
895 "/ menuPrefY := (m preferredExtentForLines:1 cols:10) y |
898 "/ menuPrefY := (m preferredExtentForLines:1 cols:10) y |
896 |
899 |
919 ! ! |
922 ! ! |
920 |
923 |
921 !ComboView class methodsFor:'documentation'! |
924 !ComboView class methodsFor:'documentation'! |
922 |
925 |
923 version |
926 version |
924 ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.113 2014-02-13 18:28:14 stefan Exp $' |
927 ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.114 2014-02-18 14:28:55 stefan Exp $' |
925 ! |
928 ! |
926 |
929 |
927 version_CVS |
930 version_CVS |
928 ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.113 2014-02-13 18:28:14 stefan Exp $' |
931 ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.114 2014-02-18 14:28:55 stefan Exp $' |
929 ! ! |
932 ! ! |
930 |
933 |