mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticked #1552: fixed non-standard button location in dialogs.

Browse Source 
First step: refactoring of WButton widget API.
(button_len): renamed to button_get_len and made global.
(button_get_text): const argument.
Removed trailing spaces.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2009-09-06 10:35:00 +04:00
parent edddd5f5d3
commit dad66d278b
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/widget.c
View File

@ -290,11 +290,11 @@ button_event (Gpm_Event *event, void *data)
return MOU_NORMAL; return MOU_NORMAL;
} }
static int int
button_len (const struct hotkey_t text, unsigned int flags) button_get_len (const WButton *b)
{ {
int ret = hotkey_width (text); int ret = hotkey_width (b->text);
switch (flags) { switch (b->flags) {
case DEFPUSH_BUTTON: case DEFPUSH_BUTTON:
ret += 6; ret += 6;
break; break;
@ -317,13 +317,13 @@ button_new (int y, int x, int action, int flags, const char *text,
{ {
WButton *b = g_new (WButton, 1); WButton *b = g_new (WButton, 1);
b->text = parse_hotkey (text);
init_widget (&b->widget, y, x, 1, button_len (b->text, flags),
button_callback, button_event);
b->action = action; b->action = action;
b->flags = flags; b->flags = flags;
b->text = parse_hotkey (text);
init_widget (&b->widget, y, x, 1, button_get_len (b),
button_callback, button_event);
b->selected = 0; b->selected = 0;
b->callback = callback; b->callback = callback;
widget_want_hotkey (b->widget, 1); widget_want_hotkey (b->widget, 1);
@ -333,27 +333,21 @@ button_new (int y, int x, int action, int flags, const char *text,
} }
const char * const char *
button_get_text (WButton *b) button_get_text (const WButton *b)
{ {
if (b->text.hotkey != NULL) if (b->text.hotkey != NULL)
return g_strconcat (b->text.start, "&", b->text.hotkey, return g_strconcat (b->text.start, "&", b->text.hotkey,
b->text.end, NULL); b->text.end, NULL);
else else
return g_strdup (b->text.start); return g_strdup (b->text.start);
} }
void void
button_set_text (WButton *b, const char *text) button_set_text (WButton *b, const char *text)
{ {
/*
g_free (b->text);
b->text = g_strdup (text);
b->widget.cols = button_len (text, b->flags);
button_scan_hotkey(b);
*/
release_hotkey (b->text); release_hotkey (b->text);
b->text = parse_hotkey (text); b->text = parse_hotkey (text);
b->widget.cols = button_len (b->text, b->flags); b->widget.cols = button_get_len (b);
dlg_redraw (b->widget.parent); dlg_redraw (b->widget.parent);
} }

3
src/widget.h
View File

@ -225,8 +225,9 @@ void gauge_show (WGauge *g, int shown);
/* Buttons */ /* Buttons */
/* return copy of button text */ /* return copy of button text */
const char *button_get_text (WButton *b); const char *button_get_text (const WButton *b);
void button_set_text (WButton *b, const char *text); void button_set_text (WButton *b, const char *text);
int button_get_len (const WButton *b);
/* Listbox manager */ /* Listbox manager */
WLEntry *listbox_get_data (WListbox *l, int pos); WLEntry *listbox_get_data (WListbox *l, int pos);