mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Issue #305 : Changed naming for consistency -> original-size

Browse Source
This commit is contained in:
jdescottes 2015-09-13 23:28:53 +02:00
parent 96ab2dd781
commit 069bfb9a90
5 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/css/toolbox-animated-preview.css
View File

@ -96,14 +96,14 @@
opacity: 1; opacity: 1;
} }
.real-size-preview-button { .original-size-button {
width : 18px; width : 18px;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
margin: 0px 5px; margin: 0 5px;
border: 2px solid white; border: 2px solid white;
background: rgba(0, 0, 0, 0.3); background-color: rgba(0, 0, 0, 0.3);
color: white; color: white;
font-size: 10px; font-size: 10px;
@ -111,17 +111,11 @@
font-family: Tahoma; font-family: Tahoma;
} }
.real-size-preview-button:hover, .original-size-button-enabled {
.real-size-preview-button-enabled {
color: gold; color: gold;
border-color: gold; border-color: gold;
} }
.real-size-preview-button-enabled:hover {
color: white;
border-color: white;
}
.preview-contextual-action { .preview-contextual-action {
float: left; float: left;
} }

32
src/js/controller/preview/PreviewController.js
View File

@ -16,7 +16,7 @@
this.fpsRangeInput = document.querySelector('#preview-fps'); this.fpsRangeInput = document.querySelector('#preview-fps');
this.fpsCounterDisplay = document.querySelector('#display-fps'); this.fpsCounterDisplay = document.querySelector('#display-fps');
this.openPopupPreview = document.querySelector('.open-popup-preview-button'); this.openPopupPreview = document.querySelector('.open-popup-preview-button');
this.realSizePreview = document.querySelector('.real-size-preview-button'); this.originalSizeButton = document.querySelector('.original-size-button');
this.setFPS(Constants.DEFAULT.FPS); this.setFPS(Constants.DEFAULT.FPS);
@ -36,10 +36,10 @@
this.toggleOnionSkinEl.addEventListener('click', this.toggleOnionSkin_.bind(this)); this.toggleOnionSkinEl.addEventListener('click', this.toggleOnionSkin_.bind(this));
pskl.utils.Event.addEventListener(this.openPopupPreview, 'click', this.onOpenPopupPreviewClick_, this); pskl.utils.Event.addEventListener(this.openPopupPreview, 'click', this.onOpenPopupPreviewClick_, this);
pskl.utils.Event.addEventListener(this.realSizePreview, 'click', this.onRealSizePreviewClick_, this); pskl.utils.Event.addEventListener(this.originalSizeButton, 'click', this.onOriginalSizeButtonClick_, this);
pskl.app.shortcutService.addShortcut('alt+O', this.toggleOnionSkin_.bind(this)); pskl.app.shortcutService.addShortcut('alt+O', this.toggleOnionSkin_.bind(this));
pskl.app.shortcutService.addShortcut('ctrl+1', this.onRealSizePreviewClick_.bind(this)); pskl.app.shortcutService.addShortcut('alt+1', this.onOriginalSizeButtonClick_.bind(this));
$.subscribe(Events.FRAME_SIZE_CHANGED, this.onFrameSizeChange_.bind(this)); $.subscribe(Events.FRAME_SIZE_CHANGED, this.onFrameSizeChange_.bind(this));
$.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this)); $.subscribe(Events.USER_SETTINGS_CHANGED, $.proxy(this.onUserSettingsChange_, this));
@ -51,7 +51,7 @@
this.updateZoom_(); this.updateZoom_();
this.updateOnionSkinPreview_(); this.updateOnionSkinPreview_();
this.updateRealSizePreviewButton_(); this.updateOriginalSizeButton_();
this.updateMaxFPS_(); this.updateMaxFPS_();
this.updateContainerDimensions_(); this.updateContainerDimensions_();
}; };
@ -60,11 +60,9 @@
this.popupPreviewController.open(); this.popupPreviewController.open();
}; };
ns.PreviewController.prototype.onRealSizePreviewClick_ = function () { ns.PreviewController.prototype.onOriginalSizeButtonClick_ = function () {
var realSizeEnabled = pskl.UserSettings.get(pskl.UserSettings.REAL_SIZE_PREVIEW); var isEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
pskl.UserSettings.set(pskl.UserSettings.REAL_SIZE_PREVIEW, !realSizeEnabled); pskl.UserSettings.set(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW, !isEnabled);
// ctrl + 1 is a browser shortcut : return false to prevent default (see ShortcutService)
return false;
}; };
ns.PreviewController.prototype.onUserSettingsChange_ = function (evt, name, value) { ns.PreviewController.prototype.onUserSettingsChange_ = function (evt, name, value) {
@ -74,7 +72,7 @@
this.updateMaxFPS_(); this.updateMaxFPS_();
} else { } else {
this.updateZoom_(); this.updateZoom_();
this.updateRealSizePreviewButton_(); this.updateOriginalSizeButton_();
this.updateContainerDimensions_(); this.updateContainerDimensions_();
} }
}; };
@ -85,10 +83,10 @@
this.toggleOnionSkinEl.classList.toggle(enabledClassname, isEnabled); this.toggleOnionSkinEl.classList.toggle(enabledClassname, isEnabled);
}; };
ns.PreviewController.prototype.updateRealSizePreviewButton_ = function () { ns.PreviewController.prototype.updateOriginalSizeButton_ = function () {
var enabledClassname = 'real-size-preview-button-enabled'; var enabledClassname = 'original-size-button-enabled';
var isEnabled = pskl.UserSettings.get(pskl.UserSettings.REAL_SIZE_PREVIEW); var isEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
this.realSizePreview.classList.toggle(enabledClassname, isEnabled); this.originalSizeButton.classList.toggle(enabledClassname, isEnabled);
}; };
ns.PreviewController.prototype.updateMaxFPS_ = function () { ns.PreviewController.prototype.updateMaxFPS_ = function () {
@ -98,11 +96,11 @@
}; };
ns.PreviewController.prototype.updateZoom_ = function () { ns.PreviewController.prototype.updateZoom_ = function () {
var realSizeEnabled = pskl.UserSettings.get(pskl.UserSettings.REAL_SIZE_PREVIEW); var originalSizeEnabled = pskl.UserSettings.get(pskl.UserSettings.ORIGINAL_SIZE_PREVIEW);
var tiledPreviewEnabled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW); var tiledPreviewEnabled = pskl.UserSettings.get(pskl.UserSettings.TILED_PREVIEW);
var useRealSize = realSizeEnabled || tiledPreviewEnabled; var useOriginalSize = originalSizeEnabled || tiledPreviewEnabled;
var zoom = useRealSize ? 1 : this.calculateZoom_(); var zoom = useOriginalSize ? 1 : this.calculateZoom_();
this.renderer.setZoom(zoom); this.renderer.setZoom(zoom);
this.setRenderFlag_(true); this.setRenderFlag_(true);
}; };

2
src/js/service/keyboard/CheatsheetService.js
View File

@ -77,7 +77,6 @@
var descriptors = [ var descriptors = [
this.toDescriptor_('0', 'Reset zoom level'), this.toDescriptor_('0', 'Reset zoom level'),
this.toDescriptor_('+/-', 'Zoom in/Zoom out'), this.toDescriptor_('+/-', 'Zoom in/Zoom out'),
this.toDescriptor_('ctrl + 1', 'Toggle 1X preview size'),
this.toDescriptor_('ctrl + Z', 'Undo'), this.toDescriptor_('ctrl + Z', 'Undo'),
this.toDescriptor_('ctrl + Y', 'Redo'), this.toDescriptor_('ctrl + Y', 'Redo'),
this.toDescriptor_('￪', 'Select previous frame'), /* ASCII for up-arrow */ this.toDescriptor_('￪', 'Select previous frame'), /* ASCII for up-arrow */
@ -85,6 +84,7 @@
this.toDescriptor_('N', 'Create new frame'), this.toDescriptor_('N', 'Create new frame'),
this.toDescriptor_('shift + N', 'Duplicate selected frame'), this.toDescriptor_('shift + N', 'Duplicate selected frame'),
this.toDescriptor_('shift + ?', 'Open/Close this popup'), this.toDescriptor_('shift + ?', 'Open/Close this popup'),
this.toDescriptor_('alt + 1', 'Toggle original size preview'),
this.toDescriptor_('alt + O', 'Toggle Onion Skin'), this.toDescriptor_('alt + O', 'Toggle Onion Skin'),
this.toDescriptor_('alt + L', 'Toggle Layer Preview') this.toDescriptor_('alt + L', 'Toggle Layer Preview')
]; ];

4
src/js/utils/UserSettings.js
View File

@ -8,7 +8,7 @@
CANVAS_BACKGROUND : 'CANVAS_BACKGROUND', CANVAS_BACKGROUND : 'CANVAS_BACKGROUND',
SELECTED_PALETTE : 'SELECTED_PALETTE', SELECTED_PALETTE : 'SELECTED_PALETTE',
TILED_PREVIEW : 'TILED_PREVIEW', TILED_PREVIEW : 'TILED_PREVIEW',
REAL_SIZE_PREVIEW : 'REAL_SIZE_PREVIEW', ORIGINAL_SIZE_PREVIEW : 'ORIGINAL_SIZE_PREVIEW',
ONION_SKIN : 'ONION_SKIN', ONION_SKIN : 'ONION_SKIN',
LAYER_PREVIEW : 'LAYER_PREVIEW', LAYER_PREVIEW : 'LAYER_PREVIEW',
LAYER_OPACITY : 'LAYER_OPACITY', LAYER_OPACITY : 'LAYER_OPACITY',
@ -23,7 +23,7 @@
'CANVAS_BACKGROUND' : 'lowcont-dark-canvas-background', 'CANVAS_BACKGROUND' : 'lowcont-dark-canvas-background',
'SELECTED_PALETTE' : Constants.CURRENT_COLORS_PALETTE_ID, 'SELECTED_PALETTE' : Constants.CURRENT_COLORS_PALETTE_ID,
'TILED_PREVIEW' : false, 'TILED_PREVIEW' : false,
'REAL_SIZE_PREVIEW' : false, 'ORIGINAL_SIZE_PREVIEW' : false,
'ONION_SKIN' : false, 'ONION_SKIN' : false,
'LAYER_OPACITY' : 0.2, 'LAYER_OPACITY' : 0.2,
'LAYER_PREVIEW' : true 'LAYER_PREVIEW' : true

2
src/templates/preview.html
View File

@ -1,7 +1,7 @@
<div id="animated-preview-container" class="preview-container"> <div id="animated-preview-container" class="preview-container">
<div class="canvas-container-wrapper minimap-container"> <div class="canvas-container-wrapper minimap-container">
<div class="preview-contextual-actions"> <div class="preview-contextual-actions">
<div class="preview-contextual-action real-size-preview-button" title="Toggle native (1x) resolution <span class='tooltip-shortcut'>(ctrl+1)</span>" rel="tooltip" data-placement="bottom">1x</div> <div class="preview-contextual-action original-size-button" title="Original size preview <span class='tooltip-shortcut'>(alt+1)</span>" rel="tooltip" data-placement="bottom">1x</div>
<div class="preview-contextual-action open-popup-preview-button" title="Open preview in popup" rel="tooltip" data-placement="bottom"></div> <div class="preview-contextual-action open-popup-preview-button" title="Open preview in popup" rel="tooltip" data-placement="bottom"></div>
</div> </div>