--- a/FileBrowserV2.st Wed Sep 06 12:20:00 2017 +0200
+++ b/FileBrowserV2.st Mon Sep 11 09:06:48 2017 +0200
@@ -2142,26 +2142,29 @@
^ nil.
!
-showImagePreview:image
- |imgView|
-
- imgView := builder componentAt:#Preview.
- (imgView isNil or:[imgView scrolledView isNil]) ifTrue:[^ self].
- imgView adjust:#fitBig.
- imgView image:image.
+showPreview:shownImage
+ |lbl previewLabel|
- "Modified: / 05-02-2007 / 10:52:03 / cg"
-!
-
-showPreview
- |shownImage lbl previewLabel|
-
- shownImage := self selectedImage.
lbl := shownImage isNil ifTrue:'Preview' ifFalse:[ shownImage fileName asFilename baseName ].
previewLabel := builder componentAt:#PreviewLabel.
previewLabel label:lbl; forceResizeHorizontally.
- self enqueueMessage:#'showImagePreview:' with:shownImage.
+
+ imgView := builder componentAt:#Preview.
+ (imgView notNil and:[imgView scrolledView notNil]) ifTrue:[
+
+ shownImage isNil ifTrue:[
+ imgView adjust:#fitBig.
+ imgView image:nil.
+ ] ifFalse:[
+ imgView adjust:#fitBig.
+ imgView image:shownImage.
+ imgView scrolledView repairDamage.
+ imgView adjust:#smoothFitBig.
+ ].
+ ].
+
+ "Created: / 10-09-2017 / 17:22:43 / cg"
!
update:something with:aParameter from:changedObject
@@ -2215,39 +2218,61 @@
|previewLabel shownImage plug closePreviewButton|
self previewVisibleHolder value ifTrue:[
- shownImage := nil.
- imgView := builder componentAt:#Preview.
- previewLabel := builder componentAt:#PreviewLabel.
- closePreviewButton := builder componentAt:#ClosePreviewButton.
+ shownImage := nil.
+ imgView := builder componentAt:#Preview.
+ previewLabel := builder componentAt:#PreviewLabel.
+ closePreviewButton := builder componentAt:#ClosePreviewButton.
+
+ plug := Plug new.
+ plug respondTo:#closePreview with:[ self previewVisibleHolder value:false ].
+
+ previewLabel menuHolder:(self class previewLabelMenu decodeAsLiteralArray).
+ previewLabel menuPerformer:plug asValue.
- plug := Plug new.
- plug respondTo:#closePreview with:[ self previewVisibleHolder value:false ].
+ closePreviewButton action:[ self previewVisibleHolder value:false ].
- previewLabel menuHolder:(self class previewLabelMenu decodeAsLiteralArray).
- previewLabel menuPerformer:plug asValue.
+ previewProcess notNil ifTrue:[
+ previewProcess terminate
+ ].
+ previewProcess := [
+ |oldBg lbl|
- closePreviewButton action:[ self previewVisibleHolder value:false ].
+ oldBg := previewLabel backgroundColor.
+ [
+ previewLabel backgroundColor:(Color red lightened).
+
+ shownImage := self selectedImage.
- previewProcess notNil ifTrue:[
- previewProcess terminate
- ].
- previewProcess := [
- |imgView oldBg shownImage lbl|
+ lbl := shownImage isNil
+ ifTrue:'Preview'
+ ifFalse:[ shownImage fileName asFilename baseName ].
+
+ previewLabel label:lbl; forceResizeHorizontally.
+
+ imgView := builder componentAt:#Preview.
+ (imgView notNil and:[imgView scrolledView notNil]) ifTrue:[
+ imgView image:nil.
+ imgView adjust:#fitBig.
- oldBg := previewLabel backgroundColor.
- previewLabel backgroundColor:(Color red lightened lightened).
- [
- self showPreview.
- previewProcess := nil.
- ] ensure:[
- previewLabel backgroundColor:oldBg.
- ].
- ] forkAt:7.
+ shownImage notNil ifTrue:[
+ imgView image:shownImage.
+ previewLabel backgroundColor:(Color red lightened lightened).
+ imgView scrolledView repairDamage.
+ imgView adjust:#smoothFitBig.
+ ].
+ ].
+ previewProcess := nil.
+ ] ensure:[
+ previewLabel backgroundColor:oldBg.
+ ].
+ ] forkAt:7.
] ifFalse:[
- imgView notNil ifTrue:[
- imgView image:nil.
- ]
+ imgView notNil ifTrue:[
+ imgView image:nil.
+ ]
].
+
+ "Modified: / 10-09-2017 / 17:51:33 / cg"
!
updateToolVisibility