Skip to content

Commit fcca563

Browse files
committed
fix: plugin panel layout fixes
1 parent 3600e32 commit fcca563

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

src/extensions/default/Phoenix-Markdown/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,9 @@ define(function (require, exports, module) {
279279
if (!panel) {
280280
$panel = $(panelHTML);
281281
$iframe = $panel.find("#panel-markdown-preview-frame");
282+
let minSize = window.innerWidth/3;
282283

283-
panel = WorkspaceManager.createPluginPanel("markdown-preview-panel", $panel, 300, $icon);
284+
panel = WorkspaceManager.createPluginPanel("markdown-preview-panel", $panel, minSize, $icon);
284285

285286
WorkspaceManager.recomputeLayout(false);
286287
$settingsToggle = $("#markdown-settings-toggle")

src/utils/Resizer.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,14 @@ define(function (require, exports, module) {
323323

324324
$element.data("show", function () {
325325
var elementOffset = $element.offset(),
326-
elementSize = elementSizeFunction.apply($element) || elementPrefs.size || minSize,
326+
elementSize = elementSizeFunction.apply($element) || elementPrefs.size,
327327
contentSize = contentSizeFunction.apply($resizableElement) || elementPrefs.contentSize;
328+
if(elementSize<minSize){
329+
elementSize = minSize;
330+
}
331+
if(contentSize<elementSize){
332+
contentSize = elementSize;
333+
}
328334

329335
// Resize the element before showing it again. If the panel was collapsed by dragging
330336
// the resizer, the size of the element should be 0, so we restore size in preferences

src/view/PluginPanelView.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ define(function (require, exports, module) {
6868
*/
6969
Panel.prototype.show = function () {
7070
this.$toolbarIcon.addClass("selected-button");
71+
this.$panel.show();
7172
exports.trigger(EVENT_PLUGIN_PANEL_SHOWN, this.panelID, this.minWidth);
7273
};
7374

@@ -78,6 +79,7 @@ define(function (require, exports, module) {
7879
this.$mainToolbar.css('width', MAIN_TOOLBAR_WIDTH);
7980
this.$windowContent.css('right', MAIN_TOOLBAR_WIDTH);
8081
this.$toolbarIcon.removeClass("selected-button");
82+
this.$panel.hide();
8183
exports.trigger(EVENT_PLUGIN_PANEL_HIDDEN, this.panelID);
8284
};
8385

src/view/WorkspaceManager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ define(function (require, exports, module) {
309309
PluginPanelView.on(PluginPanelView.EVENT_PLUGIN_PANEL_SHOWN, (event, panelID, minWidth)=>{
310310
Resizer.makeResizable($mainToolbar, Resizer.DIRECTION_HORIZONTAL, Resizer.POSITION_LEFT, minWidth,
311311
false, undefined, true, undefined, $windowContent);
312+
Resizer.show($mainToolbar[0]);
312313
recomputeLayout(true);
313314
exports.trigger(EVENT_WORKSPACE_PANEL_SHOWN, panelID);
314315
});

0 commit comments

Comments
 (0)