github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed sidepanel bug in Chrome/win

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1592 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2010-06-09 18:17:58 +00:00
parent da474c6232
commit ae34bb90fb
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
editor/svg-editor.css
View File

@@ -23,6 +23,7 @@
#svg_editor #svgroot { #svg_editor #svgroot {
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -140,6 +141,9 @@
width: 0px; width: 0px;
overflow: auto; overflow: auto;
margin: 0px; margin: 0px;
-moz-user-select: none;
-webkit-user-select: none;
} }
/* /*
@@ -162,6 +166,7 @@
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none;
} }
#svg_editor #sidepanel_handle:hover { #svg_editor #sidepanel_handle:hover {
@@ -171,6 +176,7 @@
#svg_editor #sidepanel_handle * { #svg_editor #sidepanel_handle * {
cursor: pointer; cursor: pointer;
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none;
} }
#svg_editor #layerbuttons { #svg_editor #layerbuttons {
margin: 0px; margin: 0px;
@@ -768,6 +774,7 @@ span.zoom_tool {
#svg_editor .stroke_tool div div { #svg_editor .stroke_tool div div {
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none;
width: 20px; width: 20px;
height: 20px; height: 20px;
margin: 1px 0; margin: 1px 0;

9
editor/svg-editor.js
View File

@@ -2940,9 +2940,10 @@
var SIDEPANEL_MAXWIDTH = 300; var SIDEPANEL_MAXWIDTH = 300;
var SIDEPANEL_OPENWIDTH = 150; var SIDEPANEL_OPENWIDTH = 150;
var sidedrag = -1, sidedragging = false; var sidedrag = -1, sidedragging = false, allowmove = false;
var resizePanel = function(evt) { var resizePanel = function(evt) {
if (!allowmove) return;
if (sidedrag == -1) return; if (sidedrag == -1) return;
sidedragging = true; sidedragging = true;
var deltax = sidedrag - evt.pageX; var deltax = sidedrag - evt.pageX;
@@ -2971,7 +2972,11 @@
.mousedown(function(evt) { .mousedown(function(evt) {
sidedrag = evt.pageX; sidedrag = evt.pageX;
$(window).mousemove(resizePanel); $(window).mousemove(resizePanel);
allowmove = false;
// Silly hack for Chrome, which always runs mousemove right after mousedown
setTimeout(function() {
allowmove = true;
}, 20);
}) })
.mouseup(function(evt) { .mouseup(function(evt) {
if (!sidedragging) toggleSidePanel(); if (!sidedragging) toggleSidePanel();