Index: ui/file_manager/audio_player/js/audio_player.js |
diff --git a/ui/file_manager/audio_player/js/audio_player.js b/ui/file_manager/audio_player/js/audio_player.js |
index f1a1a4a704e3c20adb97ba19f7f3db49d2229214..ea77ead08dd0ecf116cc2dcb7f14635ef35d2194 100644 |
--- a/ui/file_manager/audio_player/js/audio_player.js |
+++ b/ui/file_manager/audio_player/js/audio_player.js |
@@ -350,7 +350,14 @@ AudioPlayer.prototype.onKeyDown_ = function(event) { |
* @type {number} |
* @const |
*/ |
-AudioPlayer.HEADER_HEIGHT = 36; // 32px + border 4px |
+AudioPlayer.HEADER_HEIGHT = 33; // 32px + border 1px |
+ |
+/** |
+ * Top padding height of audio player in pixels. |
+ * @type {number} |
+ * @const |
+ */ |
+AudioPlayer.TOP_PADDING_HEIGHT = 4; |
/** |
* Track height in pixels. |
@@ -359,6 +366,7 @@ AudioPlayer.HEADER_HEIGHT = 36; // 32px + border 4px |
*/ |
AudioPlayer.TRACK_HEIGHT = 48; |
+ |
yawano
2016/01/13 10:24:02
nit: unnecessary blank line.
fukino
2016/01/14 02:25:18
Done.
|
/** |
* Controls bar height in pixels. |
* @type {number} |
@@ -378,8 +386,9 @@ AudioPlayer.DEFAULT_EXPANDED_ITEMS = 5; |
* @type {number} |
* @const |
*/ |
-AudioPlayer.EXPANDED_MODE_MIN_HEIGHT = AudioPlayer.CONTROLS_HEIGHT + |
- AudioPlayer.TRACK_HEIGHT * 2; |
+AudioPlayer.EXPANDED_MODE_MIN_HEIGHT = AudioPlayer.TOP_PADDING_HEIGHT + |
+ AudioPlayer.TRACK_HEIGHT * 2 + |
+ AudioPlayer.CONTROLS_HEIGHT; |
/** |
* Invoked when the 'expanded' property in the model is changed. |
@@ -392,7 +401,7 @@ AudioPlayer.prototype.onExpandedChanged_ = function(newValue) { |
return; |
if (this.isExpanded_ && !newValue) |
- this.lastExpandedHeight_ = window.innerHeight; |
+ this.lastExpandedInnerHeight_ = window.innerHeight; |
if (this.isExpanded_ !== newValue) { |
this.isExpanded_ = newValue; |
@@ -408,26 +417,30 @@ AudioPlayer.prototype.onExpandedChanged_ = function(newValue) { |
* @private |
*/ |
AudioPlayer.prototype.syncHeight_ = function() { |
- var targetHeight; |
+ var targetInnerHeight; |
if (this.player_.expanded) { |
// Expanded. |
- if (!this.lastExpandedHeight_ || |
- this.lastExpandedHeight_ < AudioPlayer.EXPANDED_MODE_MIN_HEIGHT) { |
+ if (!this.lastExpandedInnerHeight_ || |
+ this.lastExpandedInnerHeight_ < AudioPlayer.EXPANDED_MODE_MIN_HEIGHT) { |
var expandedListHeight = |
Math.min(this.entries_.length, AudioPlayer.DEFAULT_EXPANDED_ITEMS) * |
AudioPlayer.TRACK_HEIGHT; |
- targetHeight = AudioPlayer.CONTROLS_HEIGHT + expandedListHeight; |
- this.lastExpandedHeight_ = targetHeight; |
+ targetInnerHeight = AudioPlayer.TOP_PADDING_HEIGHT + |
+ expandedListHeight + |
+ AudioPlayer.CONTROLS_HEIGHT; |
+ this.lastExpandedInnerHeight_ = targetInnerHeight; |
} else { |
- targetHeight = this.lastExpandedHeight_; |
+ targetInnerHeight = this.lastExpandedInnerHeight_; |
} |
} else { |
// Not expanded. |
- targetHeight = AudioPlayer.CONTROLS_HEIGHT + AudioPlayer.TRACK_HEIGHT; |
+ targetInnerHeight = AudioPlayer.TOP_PADDING_HEIGHT + |
+ AudioPlayer.TRACK_HEIGHT + |
+ AudioPlayer.CONTROLS_HEIGHT; |
} |
- |
- window.resizeTo(window.innerWidth, targetHeight + AudioPlayer.HEADER_HEIGHT); |
+ window.resizeTo(window.outerWidth, |
fukino
2016/01/13 08:20:21
Not related to the issue, but it should be outerWi
|
+ AudioPlayer.HEADER_HEIGHT + targetInnerHeight); |
}; |
/** |