Merge pull request #9 from juliendelplanque/dev

Updates for Pharo 7.
juliendelplanque · Oct 9, 2018 · aa425cb · aa425cb
2 parents c4ffba0 + 6417a02
commit aa425cb
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 26 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,3 @@
+{
+	'srcDirectory' : 'src'
+}
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -0,0 +1,15 @@
+SmalltalkCISpec {
+    #loading : [
+        SCIMetacelloLoadSpec {
+            #baseline : 'Mirage',
+            #directory : 'src',
+            #platforms : [ #pharo ]
+        }
+    ],
+    #testing : {
+        #categories : [ 'Mirage-Tests' ],
+        #coverage : {
+            #categories : [ 'Mirage-Tests' ]
+    }
+  }
+}
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,19 @@
+language: smalltalk
+sudo: false
+
+notifications:
+    email:
+        on_success: never
+        on_failure: always
+
+os:
+    - linux
+    - osx
+
+smalltalk_edge:
+    source: peteruhnak/smalltalkCI
+    branch: master
+
+smalltalk:
+    - Pharo-6.1
+    - Pharo-7.0
diff --git a/README.md b/README.md
@@ -1,13 +1,15 @@
-# Mirage
+# Mirage [![Build Status](https://travis-ci.org/juliendelplanque/Mirage.svg?branch=master)](https://travis-ci.org/juliendelplanque/Mirage)
 ![Demo](https://raw.githubusercontent.com/juliendelplanque/Mirage/dev/misc/gif/demo.gif)
 
 # Install
 ## Stable version
 To install the stable version, you can simply use the **Catalog browser** and search for 'WindowsPreviewer'
 or evaluate the following code snippet:
+
+### Pharo 6.1
 ~~~
 Metacello new
-    repository: 'github://JulienDelplanque/Mirage/src';
+    repository: 'github://JulienDelplanque/Mirage:1.0.0/src';
     baseline: 'Mirage';
     load
 ~~~

diff --git a/src/Mirage-Carousel/MICarousel.class.st b/src/Mirage-Carousel/MICarousel.class.st
@@ -98,7 +98,7 @@ MICarousel >> initializeTitleMorph [
 		titleColor: self thumbnailsSelectedBorderColor;
 		extent: self extent x @ titleMorph extent y;
 		minimalHeight;
-		position: titleMorph position x @ (titleMorph position y + self extent y).
+		position: titleMorph position x @ (titleMorph position y + self extent y + Smalltalk ui theme mirageThumbnailsBorderWidth).
 	self addMorph: titleMorph.
 ]
 

diff --git a/src/Mirage-Carousel/MICarouselSettings.class.st b/src/Mirage-Carousel/MICarouselSettings.class.st
@@ -12,7 +12,12 @@ Class {
 
 { #category : #accessing }
 MICarouselSettings class >> defaultThumbnailUpdateTime [
-	^ 5
+	^ 5 seconds
+]
+
+{ #category : #accessing }
+MICarouselSettings class >> thumbnailUpdateThreadsPriority [
+	^ 10
 ]
 
 { #category : #accessing }
@@ -21,8 +26,14 @@ MICarouselSettings class >> thumbnailUpdateTime [
 ]
 
 { #category : #accessing }
-MICarouselSettings class >> thumbnailUpdateTime: anInteger [
-	thumbnailUpdateTime := anInteger
+MICarouselSettings class >> thumbnailUpdateTime: anObject [
+	anObject isInteger
+		ifTrue: [ thumbnailUpdateTime := anObject seconds ].
+
+	anObject class = Duration
+		ifFalse: [ self error: 'Thumbnail update time should be a duration or an integer.' ].
+
+	thumbnailUpdateTime := anObject
 ]
 
 { #category : #'settings-definition' }

diff --git a/src/Mirage-Carousel/Pharo3DarkTheme.extension.st b/src/Mirage-Carousel/Pharo3DarkTheme.extension.st
diff --git a/src/Mirage-Carousel/PharoDarkTheme.extension.st b/src/Mirage-Carousel/PharoDarkTheme.extension.st
@@ -0,0 +1,6 @@
+Extension { #name : #PharoDarkTheme }
+
+{ #category : #'*Mirage-Carousel' }
+PharoDarkTheme >> mirageThumbnailsSelectedBorderColor [
+	^ Color orange
+]
diff --git a/src/Mirage-Carousel/SystemWindow.extension.st b/src/Mirage-Carousel/SystemWindow.extension.st
@@ -38,14 +38,14 @@ SystemWindow >> mirageThumbnailPropertySymbol [
 
 { #category : #'*Mirage-Carousel' }
 SystemWindow >> scheduleThumbnailUpdate [
-	[ 
-		MICarouselSettings thumbnailUpdateTime seconds wait.
+	([ 
+		MICarouselSettings thumbnailUpdateTime wait.
 		self mirageMutex 
 			critical: [ 
 				self isCollapsed ifFalse: [ self updateMirageThumbnail ] ].
 		self continueToScheduleUpdate
 			ifTrue: [ self scheduleThumbnailUpdate ]
-	] forkNamed: 'MirageThumbnailUpdater'
+	] forkNamed: 'MirageThumbnailUpdater') priority: MICarouselSettings thumbnailUpdateThreadsPriority
 ]
 
 { #category : #'*Mirage-Carousel' }

diff --git a/src/Mirage-Highlighter/Pharo3DarkTheme.extension.st b/src/Mirage-Highlighter/Pharo3DarkTheme.extension.st
diff --git a/src/Mirage-Highlighter/PharoDarkTheme.extension.st b/src/Mirage-Highlighter/PharoDarkTheme.extension.st
@@ -0,0 +1,11 @@
+Extension { #name : #PharoDarkTheme }
+
+{ #category : #'*Mirage-Highlighter' }
+PharoDarkTheme >> mirageHighlighterBorderColor [
+	^ Color orange
+]
+
+{ #category : #'*Mirage-Highlighter' }
+PharoDarkTheme >> mirageTaskbarTasksHighlighterColor [
+	^ Color orange
+]