Skip to content

Commit 0042882

Browse files
author
Yuuki Harano
committed
frame の初期サイズがおかしかったのを修正。
1 parent 8ae245e commit 0042882

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/gtkutil.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,6 +1538,7 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
15381538
base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f);
15391539
base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
15401540
+ FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
1541+
PGTK_TRACE("base: %dx%d\n", base_width, base_height);
15411542

15421543
size_hints.base_width = base_width;
15431544
size_hints.base_height = base_height;

src/pgtkterm.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ x_set_offset (struct frame *f, int xoff, int yoff, int change_gravity)
398398
}
399399

400400
void
401-
x_set_window_size (struct frame *f,
401+
pgtk_set_window_size (struct frame *f,
402402
bool change_gravity,
403403
int width,
404404
int height,
@@ -409,7 +409,7 @@ x_set_window_size (struct frame *f,
409409
internal clipping.
410410
-------------------------------------------------------------------------- */
411411
{
412-
PGTK_TRACE("x_set_window_size(%dx%d, %s)", width, height, pixelwise ? "pixel" : "char");
412+
PGTK_TRACE("pgtk_set_window_size(%dx%d, %s)", width, height, pixelwise ? "pixel" : "char");
413413
int pixelwidth, pixelheight;
414414

415415
block_input ();
@@ -451,7 +451,7 @@ x_set_window_size (struct frame *f,
451451
gtk_widget_set_size_request(FRAME_GTK_WIDGET(f), pixelwidth, pixelheight);
452452
#else
453453
// gtk_widget_set_size_request(FRAME_GTK_OUTER_WIDGET(f), pixelwidth, pixelheight);
454-
PGTK_TRACE("x_set_window_size: %p: %dx%d.", f, width, height);
454+
PGTK_TRACE("pgtk_set_window_size: %p: %dx%d.", f, width, height);
455455
gtk_window_resize(GTK_WINDOW(FRAME_GTK_OUTER_WIDGET(f)), pixelwidth, pixelheight);
456456
x_wm_set_size_hint(f, 0, 0);
457457
#endif
@@ -4687,6 +4687,7 @@ pgtk_create_terminal (struct pgtk_display_info *dpyinfo)
46874687
terminal->iconify_frame_hook = pgtk_iconify_frame;
46884688
terminal->set_scroll_bar_default_width_hook = pgtk_set_scroll_bar_default_width;
46894689
terminal->set_scroll_bar_default_height_hook = pgtk_set_scroll_bar_default_height;
4690+
terminal->set_window_size_hook = pgtk_set_window_size;
46904691

46914692
/* Other hooks are NULL by default. */
46924693

0 commit comments

Comments
 (0)