Browse Source

Remove input_set_origin(). Use widget_set_size() instead.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 11 years ago
parent
commit
c058e92586
4 changed files with 5 additions and 15 deletions
  1. 3 11
      lib/widget/input.c
  2. 0 1
      lib/widget/input.h
  3. 2 1
      lib/widget/quick.c
  4. 0 2
      src/filemanager/layout.c

+ 3 - 11
lib/widget/input.c

@@ -1099,10 +1099,12 @@ input_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
     case MSG_ACTION:
         return input_execute_cmd (in, parm);
 
+    case MSG_RESIZE:
+        in->field_width = WIDGET (in)->cols;
+        /* fall through */
     case MSG_FOCUS:
     case MSG_UNFOCUS:
     case MSG_DRAW:
-    case MSG_RESIZE:
         input_update (in, FALSE);
         return MSG_HANDLED;
 
@@ -1143,16 +1145,6 @@ input_get_default_colors (void)
 
 /* --------------------------------------------------------------------------------------------- */
 
-void
-input_set_origin (WInput * in, int x, int field_width)
-{
-    WIDGET (in)->x = x;
-    in->field_width = WIDGET (in)->cols = field_width;
-    input_update (in, FALSE);
-}
-
-/* --------------------------------------------------------------------------------------------- */
-
 cb_ret_t
 input_handle_char (WInput * in, int key)
 {

+ 0 - 1
lib/widget/input.h

@@ -85,7 +85,6 @@ WInput *input_new (int y, int x, const int *input_colors,
 /* callbac is public; needed for command line */
 cb_ret_t input_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data);
 const int *input_get_default_colors (void);
-void input_set_origin (WInput * i, int x, int field_width);
 cb_ret_t input_handle_char (WInput * in, int key);
 int input_key_is_in_map (WInput * in, int key);
 void input_assign_text (WInput * in, const char *text);

+ 2 - 1
lib/widget/quick.c

@@ -493,7 +493,8 @@ quick_dialog_skip (quick_dialog_t * quick_dlg, int nskip)
                 }
 
                 /* forced update internal variables of inpuit line */
-                input_set_origin (INPUT (item->widget), item->widget->x, item->widget->cols);
+                widget_set_size (item->widget, item->widget->y, item->widget->x, 1,
+                                 item->widget->cols);
             }
             break;
 

+ 0 - 2
src/filemanager/layout.c

@@ -733,7 +733,6 @@ setup_panels (void)
     else
     {
         widget_set_size (WIDGET (cmdline), 0, 0, 0, 0);
-        input_set_origin (cmdline, 0, 0);
         widget_set_size (WIDGET (the_prompt), LINES, COLS, 0, 0);
     }
 
@@ -850,7 +849,6 @@ setup_cmdline (void)
     widget_set_size (WIDGET (the_prompt), y, 0, 1, prompt_len);
     label_set_text (the_prompt, mc_prompt);
     widget_set_size (WIDGET (cmdline), y, prompt_len, 1, COLS - prompt_len);
-    input_set_origin (cmdline, prompt_len, COLS - prompt_len);
 }
 
 /* --------------------------------------------------------------------------------------------- */