--- a/GenericToolbarIconLibrary.st Wed Aug 10 18:18:42 2016 +0100
+++ b/GenericToolbarIconLibrary.st Fri Aug 12 06:45:24 2016 +0200
@@ -7330,39 +7330,28 @@
!
currentDirectoryIcon
- <resource: #image>
- "This resource specification was automatically generated
- by the ImageEditor of ST/X."
- "Do not manually edit this!! If it is corrupted,
- the ImageEditor may not be able to read the specification."
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
+
"
self currentDirectoryIcon inspect
ImageEditor openOnClass:self andSelector:#currentDirectoryIcon
- Icon flushCachedIcons"
-
- ^ Icon
- constantNamed:#'GenericToolbarIconLibrary class currentDirectoryIcon'
- ifAbsentPut:[
- (Depth4Image new)
- width:22;
- height:22;
- photometric:(#palette);
- bitsPerSample:(#( nil ));
- samplesPerPixel:(1);
- bits:(ByteArray
- fromPackedString:'
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'GenericToolbarIconLibrary class currentDirectoryIcon'
+ ifAbsentPut:[(Depth4Image width:22 height:22) bitsPerSample:(#[8]); bits:(ByteArray fromPackedString:'
@@@@@@@@@@@@@@@@@@@@@@D@@@@@@@@@@@@@DQ@@@@@@@@@@@@DQDP@@@@@@@@@@DQ@QD@@@@@@@@@DQIBDQ@@@@@@@@DQIDP!!DP@@@@@@DQIDQDHQD@@@@@
DQIDQDQBDQ@@@@DQIDQDQDP!!DP@@DQIDQDQDQDHQD@D"IDQDQDQDQ@@A@RH$QDQDQDQD@@D@@@QDQDQDQDP@@@@@ADQD@@QDQ@@@@@@DQDP@ADQD@@@@@@QD
-Q@@DQDP@@@@@ADQDQDQDQ@@@@@@DQDQDQDQD@@@@@@QDQDQDQDP@@@@@ADQDQDQDQ@@@@@@@@@@@@@@@@@@b');
- colorMapFromArray:#[ 0 0 0 192 0 0 64 0 0 73 73 73 192 192 192 ];
- mask:((ImageMask new)
- width:22;
- height:22;
- bits:(ByteArray
- fromPackedString:'@A@@@C @A''0@A/8@A?<@A?>@A??@C?? G??0O??8_??<_??<_??<C?? C?? C?? C?? C?? C?? C?? C?? C?? ');
- yourself);
- yourself
- ]
+Q@@DQDP@@@@@ADQDQDQDQ@@@@@@DQDQDQDQD@@@@@@QDQDQDQDP@@@@@ADQDQDQDQ@@@@@@@@@@@@@@@@@@b')
+ colorMapFromArray:#[0 0 0 192 0 0 64 0 0 73 73 73 192 192 192]
+ mask:((ImageMask width:22 height:22) bits:(ByteArray fromPackedString:'@A@@@C @A''0@A/8@A?<@A?>@A??@C?? G??0O??8_??<_??<_??<C?? C?? C?? C?? C?? C?? C?? C?? C?? '); yourself); yourself]
!
cut22x22Icon
@@ -14355,38 +14344,28 @@
!
stxHomeIcon
- <resource: #image>
- "This resource specification was automatically generated
- by the ImageEditor of ST/X."
- "Do not manually edit this!! If it is corrupted,
- the ImageEditor may not be able to read the specification."
+ "This resource specification was automatically generated
+ by the ImageEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the ImageEditor may not be able to read the specification."
+
"
self stxHomeIcon inspect
ImageEditor openOnClass:self andSelector:#stxHomeIcon
- Icon flushCachedIcons"
-
- ^ Icon constantNamed:#'GenericToolbarIconLibrary class stxHomeIcon'
- ifAbsentPut:[
- (Depth4Image new)
- width:22;
- height:22;
- photometric:(#palette);
- bitsPerSample:(#( nil ));
- samplesPerPixel:(1);
- bits:(ByteArray
- fromPackedString:'
+ Icon flushCachedIcons
+ "
+
+ <resource: #image>
+
+ ^Icon
+ constantNamed:'GenericToolbarIconLibrary class stxHomeIcon'
+ ifAbsentPut:[(Depth4Image width:22 height:22) bitsPerSample:(#[8]); bits:(ByteArray fromPackedString:'
@@@@@@@@@@@@@@@@@@@@@@D@@@@@@@@@@@@@DQ@@@@@@@@@@@@DQDP@@@@@@@@@@DQ@QD@@@@@@@@@DQIBDQ@@@@@@@@DQICP!!DP@@@@@@DQICL4HQD@@@@@
DQICL3MBDQ@@@@DQIFX3L3P!!DP@@DQICY#L3L6HQD@D"ICM&L3M&M@@A@RH$L3Y#M&L4@@D@@@P3L6L6L3P@@@@@ACL3Y&L3M@@@@@@DL3L6L3L4@@@@@@P3
-L6X3L3P@@@@@ACL6L6L3M@@@@@@DM&L3M#L4@@@@@@Q&L3L3X3P@@@@@A&YDQDQ$Q@@@@@@@@@@@@@@@@@@b');
- colorMapFromArray:#[ 0 0 0 192 0 0 64 0 0 73 73 73 192 192 192 100 128 255 0 200 48 ];
- mask:((ImageMask new)
- width:22;
- height:22;
- bits:(ByteArray
- fromPackedString:'@A@@@C @A''0@A/8@A?<@A?>@A??@C?? G??0O??8_??<_??<_??<C?? C?? C?? C?? C?? C?? C?? C?? C?? ');
- yourself);
- yourself
- ]
+L6X3L3P@@@@@ACL6L6L3M@@@@@@DM&L3M#L4@@@@@@Q&L3L3X3P@@@@@A&YDQDQ$Q@@@@@@@@@@@@@@@@@@b')
+ colorMapFromArray:#[0 0 0 192 0 0 64 0 0 73 73 73 192 192 192 100 128 255 0 200 48]
+ mask:((ImageMask width:22 height:22) bits:(ByteArray fromPackedString:'@A@@@C @A''0@A/8@A?<@A?>@A??@C?? G??0O??8_??<_??<_??<C?? C?? C?? C?? C?? C?? C?? C?? C?? '); yourself); yourself]
!
unixShellTerminalIcon
--- a/ScrollableView.st Wed Aug 10 18:18:42 2016 +0100
+++ b/ScrollableView.st Fri Aug 12 06:45:24 2016 +0200
@@ -81,7 +81,7 @@
use:
v := ScrollableView forView:aViewToBeScrolled
- or:
+ or:
v := ScrollableView forView:aViewToBeScrolled in:someSuperView
It is also possible to change the scrolledView later (even multiple times).
@@ -97,7 +97,7 @@
miniscrollers which take up less screen space.
Recent changes:
- Originally, there where two classes, for vertical-only and
+ Originally, there were two classes, for vertical-only and
horizontal+vertical scrollability.
These have now been merged into the common ScrollableView class,
and each scrollability can be controlled individually.
@@ -171,7 +171,7 @@
(Delay forSeconds:5) wait.
txtView2 := EditTextView new.
- txtView2 list:#('this is the other views text'
+ txtView2 list:#('this is the other views text'
'alternative line2'
'alternative line3'
'alternative line4'
@@ -301,7 +301,7 @@
top extent:200@100.
txt := EditTextView new.
-
+
scr := ScrollableView forView:txt in:top.
scr origin:0.0@0.0 corner:1.0@1.0.
scr horizontalScrollable:true.
@@ -347,7 +347,7 @@
[exEnd]
autohiding scrollbars (edit the text to make scrollbars visible/invisible)
(NOTICE:
- this is controlled by the styleSheet and
+ this is controlled by the styleSheet and
should normally NOT be done by the program):
[exBegin]
|top scr txt|
@@ -1002,7 +1002,7 @@
autoHideHorizontalScrollBar:aBoolean
"set/clear the flag which controls if the horizontal scrollBar should
be made invisible dynamically, if there is nothing to scroll
- (and shown if there is).
+ (and shown if there is).
This flags setting is normally controlled by the styleSheet."
hideHScrollBar := aBoolean.
@@ -1014,7 +1014,7 @@
autoHideScrollBars:aBoolean
"set/clear the flag which controls if scrollBars should
be made invisible dynamically, if there is nothing to scroll
- (and shown if there is).
+ (and shown if there is).
This flags setting is normally controlled by the styleSheet."
hideVScrollBar := hideHScrollBar := aBoolean.
@@ -1026,7 +1026,7 @@
autoHideVerticalScrollBar:aBoolean
"set/clear the flag which controls if the vertical scrollBar should
be made invisible dynamically, if there is nothing to scroll
- (and shown if there is).
+ (and shown if there is).
This flags setting is normally controlled by the styleSheet."
hideVScrollBar := aBoolean.
@@ -1244,7 +1244,7 @@
pointerInView
|pv dev|
-
+
windowGroup isNil ifTrue:[^ false].
(pv := windowGroup pointerView) isNil ifTrue:[
dev := device.
@@ -1313,19 +1313,19 @@
hide := hScrollBar thumbHeight >= 100.
hide ifFalse:[
(hideScrollbarIfPointerOutside ? false) ifTrue:[
- (self pointerInView) ifFalse:[
+ (self pointerInView) ifFalse:[
scrollToOriginOnHide := false.
hide := true.
].
].
- ].
+ ].
hide ~~ hScrollBar realized not "hScrollBarHidden" ifTrue:[
hScrollBarHidden := hide.
hide ifTrue:[
scrollToOriginOnHide ifTrue:[
"/ just in case: scroll to left
scrolledView scrollHorizontalToPercent:0.
- ].
+ ].
hScrollBar beInvisible
] ifFalse:[
hScrollBar beVisible
@@ -1386,17 +1386,17 @@
vScrollBar notNil ifTrue:[
hide := vScrollBar thumbHeight >= 100.
(hideScrollbarIfPointerOutside ? false) ifTrue:[
- (self pointerInView) ifFalse:[
+ (self pointerInView) ifFalse:[
scrollToOriginOnHide := false.
hide := true.
].
- ].
+ ].
hide ~~ vScrollBar realized not" vScrollBarHidden" ifTrue:[
vScrollBarHidden := hide.
hide ifTrue:[
- scrollToOriginOnHide ifTrue:[
+ scrollToOriginOnHide ifTrue:[
"/ just in case: scroll to top
- scrolledView scrollVerticalToPercent:0.
+ scrolledView scrollVerticalToPercent:0.
].
vScrollBar beInvisible
] ifFalse:[
@@ -1444,7 +1444,7 @@
super pointerEnter:state x:x y:y.
(hideScrollbarIfPointerOutside ? false) ifTrue:[
self updateScrollBarVisibility
- ]
+ ]
!
pointerLeave:state
@@ -1687,20 +1687,20 @@
initStyle
"initialize style specifics"
- <resource: #style (#'scrollBar.position'
+ <resource: #style (#'scrollBar.position'
#'scrollBar.hiding'
#'scrollBar.hideIfPointerOutside')>
super initStyle.
DefaultLevel notNil ifTrue:[self level:DefaultLevel].
- viewBackground := MyDefaultViewBackgroundColor.
+ viewBackground := MyDefaultViewBackgroundColor.
scrollBarPosition := styleSheet at:#'scrollBar.position' default:#left.
"/ this controls hiding if there is nothing to scroll (contents fits)
hideHScrollBar := hideVScrollBar := styleSheet at:#'scrollBar.hiding' default:false.
"/ this controls automatic hiding if the pointer is outside
hideScrollbarIfPointerOutside := styleSheet at:#'scrollBar.hideIfPointerOutside' default:false.
-
+
scrolledViewHMargin := scrolledViewVMargin := DefaultScrolledViewMargin.
scrollBarVSpacing := scrollBarHSpacing := DefaultScrollBarSpacing.
@@ -1715,7 +1715,7 @@
hasVerticalScrollBar := hasHorizontalScrollBar := false.
vScrollBarHidden := hScrollBarHidden := true.
hideScrollbarIfPointerOutside := false.
-
+
super initialize.
!
@@ -1778,12 +1778,12 @@
lockUpdates := false.
scrolledView notNil ifTrue:[
- (scrolledView heightOfContentsDependsOnWidth
+ (scrolledView heightOfContentsDependsOnWidth
or:[scrolledView widthOfContentsDependsOnHeight]) ifTrue:[
hideScrollbarIfPointerOutside := false.
- ].
+ ].
].
-
+
vScrollBar notNil ifTrue:[
vScrollBar scrollAction:
[:position |
@@ -1796,7 +1796,7 @@
].
vScrollBar scrollUpAction:
- [
+ [
|sensor|
"/ in case the event came after the view was already deconstructed
scrolledView notNil ifTrue:[
@@ -1810,7 +1810,7 @@
].
vScrollBar scrollDownAction:
- [
+ [
|sensor|
"/ in case the event came after the view was already deconstructed
@@ -1837,7 +1837,7 @@
].
hScrollBar scrollUpAction:
- [
+ [
|sensor|
"/ in case the event came after the view was already deconstructed
@@ -1870,7 +1870,7 @@
scrolledView addDependent:self.
"
- pass my keyboard input (and other subviews input)
+ pass my keyboard input (and other subviews input)
to the scrolled view ...
"
self delegate:(KeyboardForwarder toView:scrolledView).