open_view: Use maximize_view to prepare non-split displays

diff --git a/tig.c b/tig.c
index 0f9394971629665bec78ae24e21fd6a3b83ffcf7..8bed28e8b72fede7d1d476e571b7a00e03b2d9f7 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -1977,14 +1977,16 @@ toggle_option(enum request request)
 }
 
 static void
 }
 
 static void

-maximize_view(struct view *view)
+maximize_view(struct view *view, bool redraw)

 {
        memset(display, 0, sizeof(display));
        current_view = 0;
        display[current_view] = view;
        resize_display();
 {
        memset(display, 0, sizeof(display));
        current_view = 0;
        display[current_view] = view;
        resize_display();

-       redraw_display(FALSE);
-       report("");
+       if (redraw) {
+               redraw_display(FALSE);
+               report("");
+       }

 }
 
 
 }
 
 


@@ -2755,11 +2757,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
                        update_view_title(prev);
                }
        } else {
                        update_view_title(prev);
                }
        } else {

-               /* Maximize the current view. */
-               memset(display, 0, sizeof(display));
-               current_view = 0;
-               display[current_view] = view;
-               resize_display();
+               maximize_view(view, FALSE);

        }
 
        /* No prev signals that this is the first loaded view. */
        }
 
        /* No prev signals that this is the first loaded view. */


@@ -3000,7 +2998,7 @@ view_driver(struct view *view, enum request request)
 
        case REQ_MAXIMIZE:
                if (displayed_views() == 2)
 
        case REQ_MAXIMIZE:
                if (displayed_views() == 2)

-                       maximize_view(view);
+                       maximize_view(view, TRUE);

                break;
 
        case REQ_OPTIONS:
                break;
 
        case REQ_OPTIONS:


@@ -3057,7 +3055,7 @@ view_driver(struct view *view, enum request request)
                 * view itself. Parents to closed view should never be
                 * followed. */
                if (view->prev && view->prev != view) {
                 * view itself. Parents to closed view should never be
                 * followed. */
                if (view->prev && view->prev != view) {

-                       maximize_view(view->prev);
+                       maximize_view(view->prev, TRUE);

                        view->prev = view;
                        break;
                }
                        view->prev = view;
                        break;
                }


@@ -5935,7 +5933,7 @@ main_request(struct view *view, enum request request, struct line *line)
        switch (request) {
        case REQ_ENTER:
                if (view_is_displayed(view) && display[0] != view)
        switch (request) {
        case REQ_ENTER:
                if (view_is_displayed(view) && display[0] != view)

-                       maximize_view(view);
+                       maximize_view(view, TRUE);

                open_view(view, REQ_VIEW_DIFF, flags);
                break;
        case REQ_REFRESH:
                open_view(view, REQ_VIEW_DIFF, flags);
                break;
        case REQ_REFRESH: