• R/O
  • SSH
  • HTTPS

kotoli: Commit


Commit MetaInfo

Revision223 (tree)
Time2011-01-19 22:59:19
Authorsiotsu

Log Message

変更)検索条件編集画面を修正

Change Summary

Incremental Difference

--- branches/experimental/1e/Kotoli/KotoliForm.cs (revision 222)
+++ branches/experimental/1e/Kotoli/KotoliForm.cs (revision 223)
@@ -190,6 +190,7 @@
190190  filename = ""hoge""
191191 OR{
192192 filename = ""foo""
193+filename = ""bar""
193194 date > 2010/08/05
194195 }
195196 }");
@@ -208,16 +209,17 @@
208209
209210 // 高さ、幅、座標を計算
210211 SetPanelHeight(rootPanel, 0);
211-
212+
212213 // Formのサイズを更新
213- searchForm.Size = new Size(rootPanel.Width, rootPanel.Height);
214+ searchForm.ClientSize = new Size(rootPanel.Width, rootPanel.Height + dicisionPanel.Height);
214215
216+ rootPanel.Dock = DockStyle.Fill;
217+ dicisionPanel.Dock = DockStyle.Bottom;
218+
215219 // 戻す
216220 this.ResumeLayout();
217221
218222 searchForm.Show();
219-
220- MessageBox.Show("Width, Height : (" + dicisionPanel.Width + ", " + dicisionPanel.Height + ")");
221223 }
222224
223225 private Control CreateSearchPanel(IQuery queryNode, Control parent)
@@ -226,7 +228,7 @@
226228 if (composite != null)
227229 {
228230 // AND/ORのパネルを作成
229- ContainerPanel cPanel = new ContainerPanel(); cPanel.BorderStyle = BorderStyle.Fixed3D;
231+ ContainerPanel cPanel = new ContainerPanel();
230232 parent.Controls.Add(cPanel);
231233
232234 // 配下の要素にも再帰
@@ -254,6 +256,7 @@
254256 foreach (Control c in parent.Controls)
255257 {
256258 // 子コントロールのうちPanelについて処理する
259+ // cond.は書き直せ
257260 if (c.GetType().ToString().IndexOf("Panel") != -1)
258261 {
259262 // Containerの場合
@@ -269,10 +272,10 @@
269272 // 入れ子構造の場合オフセット
270273 c.Left = Indent * depth;
271274 c.Width += c.Left * 2; // たぶん左右で2倍
275+
272276 c.Height += Indent; // 余白の設定
273277 c.TabIndex = tabIndex;
274278
275-
276279 // 親要素のサイズを設定
277280 int pHeight = parent.ClientSize.Height + c.Height;
278281 int pWidth = c.Width + (c.Left * 2);
@@ -285,7 +288,7 @@
285288 else // container以外のパネルの場合
286289 {
287290 // QueryPanelの場合
288- parent.Height += c.Height;// +Indent;
291+ parent.Height += c.Height;
289292 parent.Width = c.Width;
290293
291294 if (prevControl != null)
Show on old repository browser