Mercurial > emacs
comparison src/ChangeLog @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 29 Jul 2010 18:49:59 +0200 |
| parents | e82b1db50991 |
| children | 09fcb3817c1e |
comparison
equal
deleted
inserted
replaced
| 109580:3021343b766a | 109581:06384b3caebf |
|---|---|
| 1 2010-07-29 Jan Djärv <jan.h.d@swipnet.se> | |
| 2 | |
| 3 * xterm.h (struct x_output): Add toolbar_top_height, | |
| 4 toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove | |
| 5 toolbar_height. | |
| 6 if USE_GTK: Add hbox_widget and toolbar_in_hbox. | |
| 7 (FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT) | |
| 8 (FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros. | |
| 9 (FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT. | |
| 10 | |
| 11 * xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth. | |
| 12 | |
| 13 * xfns.c (x_set_tool_bar_position): New function. | |
| 14 (xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT. | |
| 15 (x_frame_parm_handlers): Add x_set_tool_bar_position. | |
| 16 (syms_of_xfns): if USE_GTK, provide move-toolbar. | |
| 17 | |
| 18 * window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT | |
| 19 and FRAME_TOOLBAR_LEFT_WIDTH. | |
| 20 | |
| 21 * gtkutil.h (xg_change_toolbar_position): Declare. | |
| 22 | |
| 23 * gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro. | |
| 24 (xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth. | |
| 25 (xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH. | |
| 26 (xg_create_frame_widgets): Create a hobox for placing widgets | |
| 27 vertically. Use gtk_box_pack_start. | |
| 28 (xg_height_or_width_changed): Renamed from xg_height_changed. | |
| 29 (x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width. | |
| 30 (xg_update_frame_menubar, free_frame_menubar): Change to | |
| 31 xg_height_or_width_changed. | |
| 32 (xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar | |
| 33 size correctly. Remove hardcoded 4, instead use handlebox size - | |
| 34 toolbar size. | |
| 35 (xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar | |
| 36 size correctly. Use handlebox size + toolbar size as additional | |
| 37 size. | |
| 38 (xg_pack_tool_bar): POS is a new parameter. | |
| 39 Set orientation of tool bar based on pos. | |
| 40 Only make handlebox_widget if NULL. | |
| 41 Check if tool bar goes to vbox or hbox depending on pos. | |
| 42 (xg_update_tool_bar_sizes): New function. | |
| 43 (update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar | |
| 44 height, call xg_update_tool_bar_sizes instead. | |
| 45 (free_frame_tool_bar): Remove from hbox or vbox depending on | |
| 46 toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero. | |
| 47 (xg_change_toolbar_position): New function. | |
| 48 | |
| 49 * frame.h (struct frame): Add tool_bar_position. | |
| 50 (Qbottom): Declare. | |
| 51 | |
| 52 * frame.c (Qtool_bar_position): New variable. | |
| 53 (make_frame): Set tool_bar_position to Qtop. | |
| 54 (frame_parms): Add tool-bar-position. | |
| 55 (x_report_frame_params): Store tool_bar_position. | |
| 56 (x_set_fringe_width): Reset wm size hint after fringe changes. | |
| 57 | |
| 1 2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> | 58 2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 59 |
| 3 Make lisp_time_argument declaration work on all systems. | 60 Make lisp_time_argument declaration work on all systems. |
| 4 * lisp.h (lisp_time_argument): Move declaration ... | 61 * lisp.h (lisp_time_argument): Move declaration ... |
| 5 * systime.h (lisp_time_argument): ... here | 62 * systime.h (lisp_time_argument): ... here |