NGEx・置換の条件欄がウィンドウサイズに応じて広がるようにした closes #132

chaika · Nov 9, 2014 · 7ae5258 · 7ae5258
1 parent 865a414
commit 7ae5258
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 47 deletions.
diff --git a/chaika/chrome/content/chaika/settings/abone-manager-ngex-editor.xml b/chaika/chrome/content/chaika/settings/abone-manager-ngex-editor.xml
@@ -18,7 +18,7 @@
 
             <xul:groupbox flex="1">
                 <xul:caption label="条件" />
-                <xul:vbox class="rule-editor"
+                <xul:vbox class="rule-editor" flex="1"
                           style="-moz-binding: url(chrome://chaika/content/settings/rule-editor.xml#editor)" />
             </xul:groupbox>
 

diff --git a/chaika/chrome/content/chaika/settings/abone-manager-ngex-new.xul b/chaika/chrome/content/chaika/settings/abone-manager-ngex-new.xul
@@ -14,7 +14,7 @@
         onunload="shutdown()"
         persist="screenX screenY width height">
 
-    <vbox id="ngex-editor"></vbox>
+    <vbox id="ngex-editor" flex="1"></vbox>
 
     <script type="application/javascript; version=1.7"
             src="chrome://chaika/content/settings/abone-manager-ngex-new.js"/>

diff --git a/chaika/chrome/content/chaika/settings/abone-manager.xul b/chaika/chrome/content/chaika/settings/abone-manager.xul
@@ -69,7 +69,7 @@
                 <button label="削除" class="button-remove" />
             </hbox>
 
-            <vbox id="ngex-editor"></vbox>
+            <vbox id="ngex-editor" flex="1"></vbox>
         </tabpanel>
     </tabpanels>
 </tabbox>

diff --git a/chaika/chrome/content/chaika/settings/replacement-manager-editor.xml b/chaika/chrome/content/chaika/settings/replacement-manager-editor.xml
@@ -18,7 +18,7 @@
 
             <xul:groupbox flex="1">
                 <xul:caption label="条件" tooltiptext="空欄にすると条件を未設定にできます" />
-                <xul:vbox class="rule-editor"
+                <xul:vbox class="rule-editor" flex="1"
                           style="-moz-binding: url(chrome://chaika/content/settings/rule-editor.xml#editor)" />
             </xul:groupbox>
 

diff --git a/chaika/chrome/content/chaika/settings/replacement-manager-new.xul b/chaika/chrome/content/chaika/settings/replacement-manager-new.xul
@@ -14,7 +14,7 @@
         onunload="shutdown()"
         persist="screenX screenY width height">
 
-    <vbox id="editor"></vbox>
+    <vbox id="editor" flex="1"></vbox>
 
     <script type="application/javascript; version=1.7"
             src="chrome://chaika/content/settings/replacement-manager-new.js"/>

diff --git a/chaika/chrome/content/chaika/settings/replacement-manager.xul b/chaika/chrome/content/chaika/settings/replacement-manager.xul
@@ -24,7 +24,7 @@
         <button label="削除" class="button-remove" />
     </hbox>
 
-    <vbox id="editor"></vbox>
+    <vbox id="editor" flex="1"></vbox>
 
     <script type="application/javascript; version=1.7"
             src="chrome://chaika/content/settings/replacement-manager.js"/>

diff --git a/chaika/chrome/content/chaika/settings/rule-editor.xml b/chaika/chrome/content/chaika/settings/rule-editor.xml
@@ -122,43 +122,6 @@
 
         <method name="adjustWindowSize">
             <body><![CDATA[
-                let rules = this._root.querySelector('.rules');
-
-                //ディスプレイ高さの7.5割以上の高さになったら、
-                //そこでウィンドウサイズを大きくするのはやめて、
-                //かわりにルール表示部にスクロールバーを表示する
-                if(window.outerHeight > window.screen.availHeight * 0.75){
-                    window.resizeTo(window.outerWidth, window.screen.availHeight * 0.75);
-
-                    if(!rules.classList.contains('fixed-height')){
-                        rules.classList.add('fixed-height');
-                        rules.style.height = Math.floor(rules.clientHeight) + 'px';
-                    }
-                }
-
-
-                //ルール表示部の下部にまだ余裕がある場合には、
-                //ルール表示部の固定高さ表示を解除する
-                let lastRule = rules.querySelector('.rule:last-child');
-                let rulesBottomMargin = rules.getBoundingClientRect().bottom -
-                                        lastRule.getBoundingClientRect().bottom;
-
-                if(rulesBottomMargin > 0){
-                    rules.classList.remove('fixed-height');
-                    rules.style.height = 'auto';
-                }
-
-
-                //条件を削除するなどして content のサイズが小さくなった場合に
-                //ウィンドウ下部の空白部分が広がってしまう問題に対処する
-                let windowBottomMargin = document.documentElement.getBoundingClientRect().bottom -
-                                         this.getBoundingClientRect().bottom;
-
-                if(windowBottomMargin > 0){
-                    window.resizeBy(0, -windowBottomMargin);
-                }
-
-
                 //条件を追加したときにウィンドウサイズが広がらず、
                 //下部が見切れてしまう問題に対処する
                 //ウィンドウの再描画がうまく行われないことが原因？

diff --git a/chaika/chrome/skin/classic/chaika/settings/rule-editor.css b/chaika/chrome/skin/classic/chaika/settings/rule-editor.css
@@ -5,7 +5,3 @@
 .template{
     display: none;
 }
-
-.fixed-height{
-    overflow: auto;
-}