From abc1fd64b5f9a2ff5e5f114a4251f4d7ca83302d Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Tue, 8 Nov 2016 19:26:47 +0300 Subject: [PATCH] more work on controls... Signed-off-by: Alex A. Naanou --- ui (gen4)/features/app.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js index 3bead5a5..4ab83a7a 100755 --- a/ui (gen4)/features/app.js +++ b/ui (gen4)/features/app.js @@ -263,13 +263,13 @@ var FullScreenControllsActions = actions.Actions({ .addClass('fullscreen-controls buttons') // minimize.... .append($('
') - .addClass('button') + .addClass('button minimize') .html('_') .attr('info', 'Minimize') .click(function(){ that.minimize() })) // fullscreen.... .append($('
') - .addClass('button') + .addClass('button fullscreen allways-shown') // square... //.html('□') // diagonal arrows... @@ -315,7 +315,24 @@ module.FullScreenControlls = core.ImageGridFeatures.Feature({ handlers: [ ['toggleFullScreen', function(){ - this.toggleFullScreenControls(this.toggleFullScreen('?')) + this.toggleFullScreenControls('on') + var fullscreen = this.toggleFullScreen('?') + var buttons = this.ribbons.viewer.find('.fullscreen-controls') + + // fullscreen button... + buttons.find('.fullscreen.button') + .html(fullscreen == 'on' ? '↙' : '↗') + .attr('info', fullscreen == 'on' ? 'Exit fullscreen' : 'Fullscreen') + + // XXX should this be done by css??? + if(fullscreen == 'on'){ + buttons.find('.button:not(.allways-shown)').show() + + } else { + buttons.find('.button:not(.allways-shown)').hide() + } + + //this.toggleFullScreenControls(fullScreen) }], ], })