Commit c619527c authored by Jan Djärv's avatar Jan Djärv
Browse files

Fix some pixelwise breakage, more remain.

* nsfns.m (ns_frame_parm_handlers): Add right/bottom_divider_width.

* nsterm.m (x_set_window_size): Handle pixelwise.
parent ff69c18f
2013-12-05 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (ns_frame_parm_handlers): Add right/bottom_divider_width.
* nsterm.m (x_set_window_size): Handle pixelwise.
2013-12-05 Martin Rudalics <rudalics@gmx.at>
* w32term.c (x_new_font):
......
......@@ -946,6 +946,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
x_set_icon_name,
x_set_icon_type,
x_set_internal_border_width, /* generic OK */
0, /* x_set_right_divider_width */
0, /* x_set_bottom_divider_width */
x_set_menu_bar_lines,
x_set_mouse_color,
x_explicitly_set_name,
......
......@@ -1258,7 +1258,7 @@ Free a pool and temporary objects it refers to (callable from C)
if (view == nil)
return;
/*fprintf (stderr, "\tsetWindowSize: %d x %d, font size %d x %d\n", cols, rows, FRAME_COLUMN_WIDTH (f), FRAME_LINE_HEIGHT (f)); */
/*fprintf (stderr, "\tsetWindowSize: %d x %d, pixelwise %d, font size %d x %d\n", cols, rows, pixelwise, FRAME_COLUMN_WIDTH (f), FRAME_LINE_HEIGHT (f));*/
block_input ();
......@@ -1267,8 +1267,18 @@ Free a pool and temporary objects it refers to (callable from C)
f->scroll_bar_actual_width = NS_SCROLL_BAR_WIDTH (f);
compute_fringe_widths (f, 0);
pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
if (pixelwise)
{
pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, cols);
pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, rows);
cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelheight);
}
else
{
pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
}
/* If we have a toolbar, take its height into account. */
if (tb && ! [view isFullscreen])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment