mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Assign button bar to the current editor.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2011-08-10 14:17:37 +04:00
parent 3b72e4275b
commit 92923aff29
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/editor/editdraw.c
View File

@ -47,7 +47,6 @@
#include "lib/skin.h"
#include "lib/strutil.h" /* utf string functions */
#include "lib/util.h" /* is_printable() */
#include "lib/widget.h" /* buttonbar_redraw() */
#include "lib/charsets.h"
#include "src/setup.h" /* edit_tab_spacing */
@ -795,15 +794,11 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
static inline void
edit_render (WEdit * edit, int page, int row_start, int col_start, int row_end, int col_end)
{
gboolean completely = (edit->force & REDRAW_COMPLETELY) != 0;
if (page) /* if it was an expose event, 'page' would be set */
edit->force |= REDRAW_PAGE | REDRAW_IN_BOUNDS;
render_edit_text (edit, row_start, col_start, row_end, col_end);
if (completely)
buttonbar_redraw (find_buttonbar (edit->widget.owner));
/*
* edit->force != 0 means a key was pending and the redraw
* was halted, so next time we must redraw everything in case stuff

24
src/editor/editwidget.c
View File

@ -675,20 +675,11 @@ edit_set_buttonbar (WEdit * edit, WButtonBar * bb)
static cb_ret_t
edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
{
WEdit *edit;
WMenuBar *menubar;
WButtonBar *buttonbar;
menubar = find_menubar (h);
buttonbar = find_buttonbar (h);
switch (msg)
{
case DLG_INIT:
edit = find_editor (h);
edit_set_buttonbar (edit, buttonbar);
return MSG_HANDLED;
case DLG_DRAW:
/* don't use common_dialog_repaint() -- we don't need a frame */
tty_setcolor (EDITOR_NORMAL_COLOR);
@ -696,6 +687,8 @@ edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
return MSG_HANDLED;
case DLG_RESIZE:
menubar = find_menubar (h);
buttonbar = find_buttonbar (h);
/* dlg_set_size() is surplus for this case */
h->lines = LINES;
h->cols = COLS;
@ -709,6 +702,7 @@ edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
if (sender == NULL)
return edit_dialog_command_execute (h, parm);
/* message from menu */
menubar = find_menubar (h);
if (sender == (Widget *) menubar)
{
if (edit_dialog_command_execute (h, parm) == MSG_HANDLED)
@ -717,6 +711,7 @@ edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
return send_message ((Widget *) h->current->data, WIDGET_COMMAND, parm);
}
/* message from buttonbar */
buttonbar = find_buttonbar (h);
if (sender == (Widget *) buttonbar)
{
if (data != NULL)
@ -772,11 +767,14 @@ edit_callback (Widget * w, widget_msg_t msg, int parm)
switch (msg)
{
case WIDGET_FOCUS:
edit_set_buttonbar (e, find_buttonbar (e->widget.owner));
e->force |= REDRAW_PAGE;
edit_update_screen (e);
return MSG_HANDLED;
case WIDGET_DRAW:
e->force |= REDRAW_COMPLETELY;
/* fallthrough */
case WIDGET_FOCUS:
edit_update_screen (e);
return MSG_HANDLED;
@ -938,6 +936,8 @@ edit_update_screen (WEdit * e)
e->force |= REDRAW_PAGE;
edit_render_keypress (e);
}
buttonbar_redraw (find_buttonbar (((Widget *) e)->owner));
}
/* --------------------------------------------------------------------------------------------- */