Popup - change maximize icon

minjk-bl · minjk-bl · commit b3de85bcab3f · 2022-04-26T11:17:43.000+09:00
diff --git a/css/popupComponent.css b/css/popupComponent.css
@@ -119,6 +119,9 @@
     padding: 15px;
     overflow: auto;
 }
+.vp-popup-content {
+    min-height: calc(100% - 30px);
+}
 .vp-popup-footer {
     position: relative;
     height: 50px;
diff --git a/html/popupComponent.html b/html/popupComponent.html
@@ -46,8 +46,8 @@
                 <!-- Title -->
             </label>
             <img class="vp-popup-toggle" src="/nbextensions/visualpython/img/minimize.svg" title="Minimize this popup">
-            <img class="vp-popup-maximize" src="/nbextensions/visualpython/img/maximize.svg" title="Maximize this popup">
-            <img class="vp-popup-return" src="/nbextensions/visualpython/img/returnSize.svg" title="Return size of this popup">
+            <img class="vp-popup-maximize" src="/nbextensions/visualpython/img/max_window.svg" title="Maximize this popup">
+            <img class="vp-popup-return" src="/nbextensions/visualpython/img/min_window.svg" title="Return size of this popup">
             <img class="vp-popup-close" src="/nbextensions/visualpython/img/close_big.svg" title="Close popup"/>
         </div>
         <div class="vp-popup-body vp-scrollbar">
diff --git a/img/max_window.svg b/img/max_window.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 1H2C1.44772 1 1 1.44772 1 2V12C1 12.5523 1.44772 13 2 13H12C12.5523 13 13 12.5523 13 12V2C13 1.44772 12.5523 1 12 1Z" stroke="#C4C4C4" stroke-width="1.5"/>
+</svg>
diff --git a/img/maximize.svg b/img/maximize.svg
diff --git a/img/min_window.svg b/img/min_window.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.60209 0C4.79454 0 4.13989 0.65465 4.13989 1.4622V3.89868H5.43989V1.4622C5.43989 1.37262 5.51251 1.3 5.60209 1.3H13.7241C13.8137 1.3 13.8863 1.37261 13.8863 1.4622V9.58419C13.8863 9.67378 13.8137 9.74639 13.7241 9.74639H10.7462V11.0464H13.7241C14.5316 11.0464 15.1863 10.3918 15.1863 9.58419V1.4622C15.1863 0.654657 14.5317 0 13.7241 0H5.60209Z" fill="#C4C4C4"/>
+<path d="M9.93419 3.89868H1.8122C1.36364 3.89868 1 4.26232 1 4.71088V12.8329C1 13.2814 1.36364 13.6451 1.8122 13.6451H9.93419C10.3828 13.6451 10.7464 13.2814 10.7464 12.8329V4.71088C10.7464 4.26232 10.3828 3.89868 9.93419 3.89868Z" stroke="#C4C4C4" stroke-width="1.4"/>
+</svg>
diff --git a/img/returnSize.svg b/img/returnSize.svg
diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js
@@ -260,6 +260,11 @@ define([
             $(this.wrapSelector('.vp-popup-maximize')).on('click', function(evt) {
                 // save position
                 that.config.position = $(that.wrapSelector()).position();
+                // save size
+                that.config.size = {
+                    width: $(that.wrapSelector()).width(),
+                    height: $(that.wrapSelector()).height()
+                }
                 // maximize popup
                 $(that.wrapSelector()).css({
                     width: '100%',
