1 To: [email protected] |
|
2 Subject: Patch 7.2.263 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.263 |
|
11 Problem: GTK2: when using the -geom argument with an offset from the right |
|
12 edge and the size is smaller than the default, the Vim window is |
|
13 not positioned properly. |
|
14 Solution: Use another function to set the size. (Vitaly Minko) |
|
15 Files: src/gui_gtk_x11.c |
|
16 |
|
17 |
|
18 *** ../vim-7.2.262/src/gui_gtk_x11.c 2009-09-11 15:46:20.000000000 +0200 |
|
19 --- src/gui_gtk_x11.c 2009-09-23 15:43:52.000000000 +0200 |
|
20 *************** |
|
21 *** 4066,4071 **** |
|
22 --- 4066,4073 ---- |
|
23 { |
|
24 guicolor_T fg_pixel = INVALCOLOR; |
|
25 guicolor_T bg_pixel = INVALCOLOR; |
|
26 + guint pixel_width; |
|
27 + guint pixel_height; |
|
28 |
|
29 #ifdef HAVE_GTK2 |
|
30 /* |
|
31 *************** |
|
32 *** 4106,4113 **** |
|
33 unsigned int w, h; |
|
34 int x = 0; |
|
35 int y = 0; |
|
36 - guint pixel_width; |
|
37 - guint pixel_height; |
|
38 |
|
39 mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h); |
|
40 |
|
41 --- 4108,4113 ---- |
|
42 *************** |
|
43 *** 4160,4168 **** |
|
44 } |
|
45 } |
|
46 |
|
47 ! gtk_form_set_size(GTK_FORM(gui.formwin), |
|
48 ! (guint)(gui_get_base_width() + Columns * gui.char_width), |
|
49 ! (guint)(gui_get_base_height() + Rows * gui.char_height)); |
|
50 update_window_manager_hints(0, 0); |
|
51 |
|
52 if (foreground_argument != NULL) |
|
53 --- 4160,4175 ---- |
|
54 } |
|
55 } |
|
56 |
|
57 ! pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); |
|
58 ! pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); |
|
59 ! #ifdef HAVE_GTK2 |
|
60 ! /* For GTK2 changing the size of the form widget doesn't cause window |
|
61 ! * resizing. */ |
|
62 ! if (gtk_socket_id == 0) |
|
63 ! gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height); |
|
64 ! #else |
|
65 ! gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height); |
|
66 ! #endif |
|
67 update_window_manager_hints(0, 0); |
|
68 |
|
69 if (foreground_argument != NULL) |
|
70 *** ../vim-7.2.262/src/version.c 2009-09-18 17:24:54.000000000 +0200 |
|
71 --- src/version.c 2009-09-23 17:34:08.000000000 +0200 |
|
72 *************** |
|
73 *** 678,679 **** |
|
74 --- 678,681 ---- |
|
75 { /* Add new patch number below this line */ |
|
76 + /**/ |
|
77 + 263, |
|
78 /**/ |
|
79 |
|
80 -- |
|
81 hundred-and-one symptoms of being an internet addict: |
|
82 267. You get an extra phone line so you can get phone calls. |
|
83 |
|
84 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
85 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
86 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
87 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|