From b21cb665e3ca296b56d389d3a2f83434f4646f26 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Oct 2014 16:42:08 -0400
Subject: logarithmic wallpaper scale

---
 public/assets/javascripts/ui/editor/WallpaperPicker.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'public/assets/javascripts/ui/editor/WallpaperPicker.js')

diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index b26a5dc..8f701b0 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -157,13 +157,13 @@ var WallpaperPicker = UploadView.extend({
       return;
     }
     this.wall = wall
-    this.$scale.val( this.wall.background.scale )
+    this.$scale.val( Math.log( this.wall.background.scale ) )
   },
   
   updateScale: function(){
     if (! this.wall) return;
-    s = parseFloat(this.$scale.val())
-    this.wall.wallpaperPosition({ scale: s })
+    var scale = Math.exp( parseFloat(this.$scale.val()) )
+    this.wall.wallpaperPosition({ scale: scale })
   },
 
   tileWalls: function(){
@@ -192,7 +192,7 @@ var WallpaperPicker = UploadView.extend({
       down: function(e, cursor){
         if (! base.wall) return
         dragging = true
-        s = parseFloat( base.$scale.val() )
+        // s = parseFloat( base.$scale.val() )
         x = base.wall.background.x
         y = base.wall.background.y
       },
@@ -203,7 +203,7 @@ var WallpaperPicker = UploadView.extend({
         dx = delta.a*s
         dy = delta.b*s
         base.wall.wallpaperPosition({
-          scale: s,
+          // scale: s,
           x: x+dx,
           y: y+dy,
         })
-- 
cgit v1.2.3-70-g09d2


From 6dadb217e8253138936d4f5180f9cefa6e7caed9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 20 Oct 2014 16:57:56 -0400
Subject: disable wallpaper resize controls

---
 public/assets/javascripts/ui/editor/WallpaperPicker.js | 5 +++++
 public/assets/stylesheets/app.css                      | 4 ++++
 2 files changed, 9 insertions(+)

(limited to 'public/assets/javascripts/ui/editor/WallpaperPicker.js')

diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 8f701b0..994fe74 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -27,6 +27,9 @@ var WallpaperPicker = UploadView.extend({
 	  this.$position = this.$("[data-role='wallpaper-position']")
 	  this.$scale = this.$("[data-role='wallpaper-scale']")
 	  
+	  this.$wallpaperResizeControls = this.$(".wallpaperResizeControls")
+	  this.$wallpaperResizeControls.addClass('disabled')
+	  
 	  this.initializePositionCursor()
 	},
 	
@@ -154,8 +157,10 @@ var WallpaperPicker = UploadView.extend({
 	wall: null,
 	pickWall: function(wall){
     if (! wall.background || wall.background.src == "none") {
+      this.$wallpaperResizeControls.addClass('disabled')
       return;
     }
+    this.$wallpaperResizeControls.removeClass('disabled')
     this.wall = wall
     this.$scale.val( Math.log( this.wall.background.scale ) )
   },
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 226fe98..641fa75 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1630,6 +1630,10 @@ input[type="range"]::-webkit-slider-thumb {
 	border:3px solid #000;
 }
 
+.wallpaperResizeControls.disabled {
+  pointer-events: none;
+  opacity: 0.3;
+}
 .wallpaperResizeControls input[type=range] {
   width: 130px;
   position: relative;
-- 
cgit v1.2.3-70-g09d2