Merge pull request #3921 from Atlante45/tabs_to_spaces

Tabs to spaces
This commit is contained in:
Brad Hefta-Gaub 2014-12-08 15:55:05 -08:00
commit 39b1f73976
3 changed files with 252 additions and 250 deletions

4
.gitignore vendored
View file

@ -32,5 +32,9 @@ DerivedData
interface/external/*/*
!interface/external/*/readme.txt
# ignore interface optional resources
interface/resources/visage/*
!interface/resources/visage/tracker.cfg
# Ignore interfaceCache for Linux users
interface/interfaceCache/

View file

@ -197,8 +197,7 @@ function formatTime(time) {
function moveUI() {
var relative = { x: 70, y: 40 };
toolBar.move(relative.x,
windowDimensions.y - relative.y);
toolBar.move(relative.x, windowDimensions.y - relative.y);
Overlays.editOverlay(timer, {
x: relative.x + timerOffset - ToolBar.SPACING,
y: windowDimensions.y - relative.y - ToolBar.SPACING
@ -312,8 +311,7 @@ function mouseReleaseEvent(event) {
function update() {
var newDimensions = Controller.getViewportDimensions();
if (windowDimensions.x != newDimensions.x ||
windowDimensions.y != newDimensions.y) {
if (windowDimensions.x != newDimensions.x || windowDimensions.y != newDimensions.y) {
windowDimensions = newDimensions;
moveUI();
}