diff -ur freeciv/client/gui-gtk/mapview.c show_buttom_row2/client/gui-gtk/mapview.c --- freeciv/client/gui-gtk/mapview.c Fri Mar 10 17:56:07 2000 +++ show_buttom_row2/client/gui-gtk/mapview.c Mon Mar 13 01:10:40 2000 @@ -230,10 +230,10 @@ **************************************************************************/ void set_overview_dimensions(int x, int y) { - gtk_widget_set_usize(overview_canvas, 2*x, 2*y); + gtk_widget_set_usize(overview_canvas, 2*x, 2*(y+1/*exstra buttom row*/)); overview_canvas_store_width=2*x; - overview_canvas_store_height=2*y; + overview_canvas_store_height=2*(y+1/*exstra buttom row*/); if(overview_canvas_store) gdk_pixmap_unref(overview_canvas_store); @@ -633,8 +633,8 @@ new_map_view_x0=map_adjust_x(x-map_canvas_store_twidth/2); new_map_view_y0=map_adjust_y(y-map_canvas_store_theight/2); - if(new_map_view_y0>map.ysize-map_canvas_store_theight) - new_map_view_y0=map_adjust_y(map.ysize-map_canvas_store_theight); + if(new_map_view_y0>map.ysize+1/*exstra row at buttom*/-map_canvas_store_theight) + new_map_view_y0=map_adjust_y(map.ysize+1/*-"-*/-map_canvas_store_theight); map_view_x0=new_map_view_x0; map_view_y0=new_map_view_y0; @@ -907,7 +907,7 @@ { map_hadj=gtk_adjustment_new(-1, 0, map.xsize, 1, map_canvas_store_twidth, map_canvas_store_twidth); - map_vadj=gtk_adjustment_new(-1, 0, map.ysize, 1, + map_vadj=gtk_adjustment_new(-1, 0, map.ysize+1/*exstra buttom row*/, 1, map_canvas_store_theight, map_canvas_store_theight); gtk_range_set_adjustment(GTK_RANGE(map_horizontal_scrollbar), GTK_ADJUSTMENT(map_hadj)); @@ -1382,8 +1382,8 @@ else { map_view_y0=percent; map_view_y0=(map_view_y0<0) ? 0 : map_view_y0; - map_view_y0=(map_view_y0>map.ysize-map_canvas_store_theight) ? - map.ysize-map_canvas_store_theight : map_view_y0; + map_view_y0=(map_view_y0>map.ysize+1/*exstra buttom row*/-map_canvas_store_theight) ? + map.ysize+1/*-"-*/-map_canvas_store_theight : map_view_y0; } if(last_map_view_x0!=map_view_x0 || last_map_view_y0!=map_view_y0) {