Changeset 3982
- Timestamp:
- 2005年11月21日 07時42分03秒 (3 years ago)
- Files:
-
- trunk/src/ChangeLog.Meadow (modified) (1 diff)
- trunk/src/frame.c (modified) (1 diff)
- trunk/src/mw32fns.c (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/ChangeLog.Meadow
r3981 r3982 1 2005-11-21 MIYOSHI Masanori <miyoshi@meadowy.org> 2 3 * mw32fns.c (mw32_real_positions): Call AdjustWindowRectEx() 4 instead of AdjustWindowRect(). 5 (mw32_check_fullscreen): Don't increment the width and the height 6 of the frame. 7 (mw32_check_fullscreen): Don't maximize the frame with 8 `WM_SYSCOMMAND'. 9 (mw32_WndProc<WM_MOVE>): Call mw32_real_positions(). 10 (mw32_WndProc<SIZE_RESTORED>): Ditto. 11 (mw32_WndProc<WM_WINDOWPOSCHANGED): Ditto. 12 (mw32_WndProc<WM_WINDOWPOSCHANGED>): Call AdjustWindowRectEx() 13 instead of AdjustWindowRect(). 14 15 * frame.c (x_set_frame_parameters): Undo the last change. 16 1 17 2005-11-20 Masayuki FUJII <boochang@m4.kcn.ne.jp> 2 18 trunk/src/frame.c
r3945 r3982 2873 2873 || height != FRAME_LINES (f) 2874 2874 || f->new_text_lines || f->new_text_cols) 2875 #ifdef MEADOW2876 if (!f->want_fullscreen)2877 #endif /* MEADOW */2878 2875 Fset_frame_size (frame, make_number (width), make_number (height)); 2879 2876 trunk/src/mw32fns.c
r3978 r3982 168 168 169 169 GetClientRect ((HWND) FRAME_MW32_WINDOW (f), &rect); 170 AdjustWindowRect (&rect, f->output_data.mw32->dwStyle, 171 FRAME_EXTERNAL_MENU_BAR (f)); 170 AdjustWindowRectEx (&rect, f->output_data.mw32->dwStyle, 171 FRAME_EXTERNAL_MENU_BAR (f), 172 f->output_data.mw32->dwStyleEx); 172 173 173 174 pt.x = rect.left; … … 197 198 x_fullscreen_adjust (f, &width, &height, &f->top_pos, &f->left_pos); 198 199 199 if (f->want_fullscreen & FULLSCREEN_WIDTH200 && f->want_fullscreen & FULLSCREEN_HEIGHT)201 {202 /* TODO: Investigate why this correction is needed. */203 width++;204 height++;205 }206 207 200 /* We do not need to move the window, it shall be taken care of 208 201 when setting WM manager hints. */ 209 202 if (FRAME_COLS (f) != width || FRAME_LINES (f) != height) 210 203 { 211 if (!f->async_iconified )204 if (!f->async_iconified && !f->async_visible) 212 205 { 213 206 change_frame_size (f, height, width, 0, 1, 0); … … 217 210 /* Wait for the change of frame size to occur */ 218 211 f->want_fullscreen |= FULLSCREEN_WAIT; 219 220 if (f->want_fullscreen & FULLSCREEN_WIDTH 221 && f->want_fullscreen & FULLSCREEN_HEIGHT) 222 PostMessage (FRAME_MW32_WINDOW (f), 223 WM_SYSCOMMAND, SC_MAXIMIZE, 0); 224 else 225 x_set_window_size (f, 0, width, height); 212 x_set_window_size (f, 0, width, height); 226 213 } 227 214 } … … 2048 2035 GetWindowRect (hwnd, &rect); 2049 2036 2050 f->left_pos = rect.left; 2051 f->top_pos = rect.top; 2037 mw32_real_positions (f, &f->left_pos, &f->top_pos); 2052 2038 } 2053 2039 … … 2073 2059 f->async_visible = IsWindowVisible (hwnd); 2074 2060 f->async_iconified = IsIconic (hwnd); 2075 f->left_pos = rect.left; 2076 f->top_pos = rect.top; 2061 mw32_real_positions (f, &f->left_pos, &f->top_pos); 2077 2062 SET_FRAME_GARBAGED (f); 2078 2063 mw32_update_frame_alpha (f); … … 2085 2070 if (!wParam) 2086 2071 { 2087 f->async_visible = 0;2088 f->async_iconified = 1;2072 f->async_visible = 0; 2073 f->async_iconified = 1; 2089 2074 } 2090 2075 goto dflt; … … 2107 2092 GetWindowRect (hwnd, &rect); 2108 2093 /* position change */ 2109 f->left_pos = rect.left; 2110 f->top_pos = rect.top; 2094 mw32_real_positions (f, &f->left_pos, &f->top_pos); 2111 2095 call_defprocp = 0; 2112 2096 } … … 2170 2154 nrect.right = width; 2171 2155 nrect.bottom = height; 2172 AdjustWindowRect (&nrect, f->output_data.mw32->dwStyle, 2173 FRAME_EXTERNAL_MENU_BAR (f)); 2156 AdjustWindowRectEx (&nrect, f->output_data.mw32->dwStyle, 2157 FRAME_EXTERNAL_MENU_BAR (f), 2158 f->output_data.mw32->dwStyleEx); 2174 2159 2175 2160 get_working_area_size (hwnd, &work_area_w, &work_area_h);
