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

(mcview_new): use WRect to define a panel area.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2024-02-18 15:04:00 +03:00
parent d16ca7a1f5
commit fe47ac5b56
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filemanager/layout.c
View File

@ -1196,7 +1196,7 @@ create_panel (int num, panel_view_mode_t type)
break; break;
case view_quick: case view_quick:
new_widget = WIDGET (mcview_new (r.y, r.x, r.lines, r.cols, TRUE)); new_widget = WIDGET (mcview_new (&r, TRUE));
the_other_panel = PANEL (panels[the_other].widget); the_other_panel = PANEL (panels[the_other].widget);
if (the_other_panel != NULL) if (the_other_panel != NULL)
file_name = panel_current_entry (the_other_panel)->fname->str; file_name = panel_current_entry (the_other_panel)->fname->str;

10
src/viewer/mcviewer.c
View File

@ -195,16 +195,15 @@ mcview_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
WView * WView *
mcview_new (int y, int x, int lines, int cols, gboolean is_panel) mcview_new (const WRect * r, gboolean is_panel)
{ {
WRect r = { y, x, lines, cols };
WView *view; WView *view;
Widget *w; Widget *w;
view = g_new0 (WView, 1); view = g_new0 (WView, 1);
w = WIDGET (view); w = WIDGET (view);
widget_init (w, &r, mcview_callback, mcview_mouse_callback); widget_init (w, r, mcview_callback, mcview_mouse_callback);
w->options |= WOP_SELECTABLE | WOP_TOP_SELECT; w->options |= WOP_SELECTABLE | WOP_TOP_SELECT;
w->keymap = viewer_map; w->keymap = viewer_map;
@ -243,6 +242,7 @@ mcview_viewer (const char *command, const vfs_path_t * file_vpath, int start_lin
WDialog *view_dlg; WDialog *view_dlg;
Widget *vw, *b; Widget *vw, *b;
WGroup *g; WGroup *g;
WRect r;
/* Create dialog and widgets, put them on the dialog */ /* Create dialog and widgets, put them on the dialog */
view_dlg = dlg_create (FALSE, 0, 0, 1, 1, WPOS_FULLSCREEN, FALSE, NULL, mcview_dialog_callback, view_dlg = dlg_create (FALSE, 0, 0, 1, 1, WPOS_FULLSCREEN, FALSE, NULL, mcview_dialog_callback,
@ -252,7 +252,9 @@ mcview_viewer (const char *command, const vfs_path_t * file_vpath, int start_lin
g = GROUP (view_dlg); g = GROUP (view_dlg);
lc_mcview = mcview_new (vw->rect.y, vw->rect.x, vw->rect.lines - 1, vw->rect.cols, FALSE); r = vw->rect;
r.lines--;
lc_mcview = mcview_new (&r, FALSE);
group_add_widget_autopos (g, lc_mcview, WPOS_KEEP_ALL, NULL); group_add_widget_autopos (g, lc_mcview, WPOS_KEEP_ALL, NULL);
b = WIDGET (buttonbar_new ()); b = WIDGET (buttonbar_new ());

7
src/viewer/mcviewer.h
View File

@ -6,6 +6,7 @@
#define MC__VIEWER_H #define MC__VIEWER_H
#include "lib/global.h" #include "lib/global.h"
#include "lib/widget.h" /* WRect */
/*** typedefs(not structures) and defined constants **********************************************/ /*** typedefs(not structures) and defined constants **********************************************/
@ -37,10 +38,8 @@ extern char *mcview_show_eof;
/*** declarations of public functions ************************************************************/ /*** declarations of public functions ************************************************************/
/* Creates a new WView object with the given properties. Caveat: the /* Creates a new WView object with the given properties. */
* origin is in y-x order, while the extent is in x-y order. */ extern WView *mcview_new (const WRect * r, gboolean is_panel);
extern WView *mcview_new (int y, int x, int lines, int cols, gboolean is_panel);
/* Shows {file} or the output of {command} in the internal viewer, /* Shows {file} or the output of {command} in the internal viewer,
* starting in line {start_line}. * starting in line {start_line}.