fix NG word window's layout.

git-svn-id: http://svn.sourceforge.jp/svnroot/bchan/bchan/trunk@280 20a0b8eb-f62a-4a12-8fe1-b598822500fb

diff --git a/src/bchan.d b/src/bchan.d
index 52f6922..e056756 100644 (file)
--- a/src/bchan.d
+++ b/src/bchan.d
@@ -64,6 +64,32 @@
 .TB_NGWORD_APPEND      =       51
 .MS_NGWORD_APPEND      =       52
 
+---  for NG word window layout values.
+
+.NGWORD_MARGIN = 8
+.NGWORD_TEXT_HEIGHT = 24
+.NGWORD_TEXT_WIDTH = 360
+.NGWORD_LIST_WIDTH = NGWORD_TEXT_WIDTH
+.NGWORD_LIST_HEIGHT = 144
+.NGWORD_BUTTON_WIDTH = 80
+.NGWORD_BUTTON_HEIGHT = NGWORD_TEXT_HEIGHT
+.NGWORD_APDTB_L = NGWORD_MARGIN
+.NGWORD_APDTB_T = NGWORD_MARGIN
+.NGWORD_APDTB_R = NGWORD_APDTB_L+NGWORD_TEXT_WIDTH
+.NGWORD_APDTB_B = NGWORD_APDTB_T+NGWORD_TEXT_HEIGHT
+.NGWORD_APDMS_L = NGWORD_APDTB_R+NGWORD_MARGIN
+.NGWORD_APDMS_T = NGWORD_MARGIN
+.NGWORD_APDMS_R = NGWORD_APDMS_L+NGWORD_BUTTON_WIDTH
+.NGWORD_APDMS_B = NGWORD_APDMS_T+NGWORD_BUTTON_HEIGHT
+.NGWORD_LIST_L = NGWORD_MARGIN
+.NGWORD_LIST_T = NGWORD_APDTB_B+NGWORD_MARGIN+NGWORD_MARGIN
+.NGWORD_LIST_R = NGWORD_LIST_L+NGWORD_LIST_WIDTH
+.NGWORD_LIST_B = NGWORD_LIST_T+NGWORD_LIST_HEIGHT
+.NGWORD_DELMS_L = NGWORD_LIST_R+NGWORD_MARGIN
+.NGWORD_DELMS_T = NGWORD_LIST_T
+.NGWORD_DELMS_R = NGWORD_DELMS_L+NGWORD_BUTTON_WIDTH
+.NGWORD_DELMS_B = NGWORD_DELMS_T+NGWORD_BUTTON_HEIGHT
+
 ---------
 -- data type = PARTS_DATA
 ---------
@@ -95,7 +121,7 @@
 
        {# SS_NGWORD_LIST 0 0}  -- data number
        SS_PARTS+P_DISP+P_NOSEL:L       -- type
-       {0H 0H 180H 100H}       -- r
+       {NGWORD_LIST_L:H NGWORD_LIST_T:H NGWORD_LIST_R:H NGWORD_LIST_B:H}        -- r
        0L                      -- cv
        OFFSET:L+20             -- name
        {0L 0L -1L 0L}          -- PARTDISP
@@ -103,7 +129,7 @@
 
        {# MS_NGWORD_DELETE 0 0}        -- data number
        MS_PARTS+P_DISP:L       -- type
-       {0H 0H 80H 24H} -- r
+       {NGWORD_DELMS_L:H NGWORD_DELMS_T:H NGWORD_DELMS_R:H NGWORD_DELMS_B:H}   -- r
        0L                      -- cv (unused)
        OFFSET:L+20             -- name ()
        {0L 0L -1L 0L}          -- PARTDISP
@@ -111,14 +137,14 @@
 
        {# TB_NGWORD_APPEND 0 0}        -- data number
        TB_PARTS+P_DISP:L       -- type
-       {0H 0H 180H 24H}        -- r
+       {NGWORD_APDTB_L:H NGWORD_APDTB_T:H NGWORD_APDTB_R:H NGWORD_APDTB_B:H}   -- r
        128L                    -- txsize
        0L                      -- text
        {0L 0L -1L 0L}          -- PARTDISP
 
        {# MS_NGWORD_APPEND 0 0}        -- data number
        MS_PARTS+P_DISP:L       -- type
-       {0H 0H 80H 24H} -- r
+       {NGWORD_APDMS_L:H NGWORD_APDMS_T:H NGWORD_APDMS_R:H NGWORD_APDMS_B:H}   -- r
        0L                      -- cv (unused)
        OFFSET:L+20             -- name ()
        {0L 0L -1L 0L}          -- PARTDISP

diff --git a/src/hmi.c b/src/hmi.c
index 99b6fda..94f27da 100644 (file)
--- a/src/hmi.c
+++ b/src/hmi.c
@@ -775,7 +775,6 @@ EXPORT W ngwordwindow_open(ngwordwindow_t *window)
 {
        TC test[] = {TK_N, TK_G, 0x256F, 0x213C, 0x2549, 0x306C, 0x4D77,TNULL};
        WID wid;
-       PNT pos;
 
        if (window->wid > 0) {
                return 0;
@@ -789,27 +788,19 @@ EXPORT W ngwordwindow_open(ngwordwindow_t *window)
        window->wid = wid;
        window->gid = wget_gid(wid);
 
-       pos.x = 0;
-       pos.y = 0;
-       window->ss_list_id = copn_par(wid, window->dnum_list, &pos);
+       window->ss_list_id = copn_par(wid, window->dnum_list, NULL);
        if (window->ss_list_id < 0) {
                DP_ER("copn_par list error:", window->ss_list_id);
        }
-       pos.x = 0;
-       pos.y = 100;
-       window->ms_delete_id = copn_par(wid, window->dnum_delete, &pos);
+       window->ms_delete_id = copn_par(wid, window->dnum_delete, NULL);
        if (window->ms_delete_id < 0) {
                DP_ER("copn_par delete error:", window->ms_delete_id);
        }
-       pos.x = 0;
-       pos.y = 130;
-       window->tb_input_id = copn_par(wid, window->dnum_input, &pos);
+       window->tb_input_id = copn_par(wid, window->dnum_input, NULL);
        if (window->tb_input_id < 0) {
                DP_ER("copn_par input error:", window->tb_input_id);
        }
-       pos.x = 0;
-       pos.y = 160;
-       window->ms_append_id = copn_par(wid, window->dnum_append, &pos);
+       window->ms_append_id = copn_par(wid, window->dnum_append, NULL);
        if (window->ms_append_id < 0) {
                DP_ER("copn_par append error:", window->ms_append_id);
        }
@@ -1667,8 +1658,8 @@ LOCAL ngwordwindow_t* ngwordwindow_new(PNT *p, WID parent, W dnum_list, W dnum_d
        window->gid = -1;
        window->parent = parent;
        window->r.p.lefttop = *p;
-       window->r.p.rightbot.x = p->x + 300 + 7;
-       window->r.p.rightbot.y = p->y + 200 + 30;
+       window->r.p.rightbot.x = p->x + 8+360+8+80+8 + 7;
+       window->r.p.rightbot.y = p->y + 8+24+16+144+8 + 30;
        err = wget_inf(WI_PANELBACK, &window->bgpat, sizeof(PAT));
        if (err != sizeof(PAT)) {
                DP_ER("wget_inf error:", err);