[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r116894: In x_new_font don't calculate non-toolki
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] emacs-24 r116894: In x_new_font don't calculate non-toolkit scrollbar width from font width (Bug#17163). |
Date: |
Wed, 02 Apr 2014 14:33:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116894
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-04-02 16:33:33 +0200
message:
In x_new_font don't calculate non-toolkit scrollbar width from font width
(Bug#17163).
* xterm.c (x_new_font): Don't calculate non-toolkit scrollbar
width from font width (Bug#17163).
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-03-30 13:31:45 +0000
+++ b/src/ChangeLog 2014-04-02 14:33:33 +0000
@@ -1,3 +1,8 @@
+2014-04-02 Martin Rudalics <address@hidden>
+
+ * xterm.c (x_new_font): Don't calculate non-toolkit scrollbar
+ width from font width (Bug#17163).
+
2014-03-30 Martin Rudalics <address@hidden>
* frame.c (x_set_frame_parameters): Calculate default values of
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2014-03-28 00:50:53 +0000
+++ b/src/xterm.c 2014-04-02 14:33:33 +0000
@@ -7778,20 +7778,16 @@
compute_fringe_widths (f, 1);
+ /* Compute character columns occupied by scrollbar.
+
+ Don't do things differently for non-toolkit scrollbars
+ (Bug#17163). */
unit = FRAME_COLUMN_WIDTH (f);
-#ifdef USE_TOOLKIT_SCROLL_BARS
- /* The width of a toolkit scrollbar does not change with the new
- font but we have to calculate the number of columns it occupies
- anew. */
- FRAME_CONFIG_SCROLL_BAR_COLS (f)
- = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + unit - 1) / unit;
-#else
- /* The width of a non-toolkit scrollbar is at least 14 pixels and a
- multiple of the frame's character width. */
- FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + unit - 1) / unit;
- FRAME_CONFIG_SCROLL_BAR_WIDTH (f)
- = FRAME_CONFIG_SCROLL_BAR_COLS (f) * unit;
-#endif
+ if (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) > 0)
+ FRAME_CONFIG_SCROLL_BAR_COLS (f)
+ = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) + unit - 1) / unit;
+ else
+ FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + unit - 1) / unit;
if (FRAME_X_WINDOW (f) != 0)
{
@@ -7997,7 +7993,7 @@
{
#ifdef HAVE_X11R6_XIM
struct xim_inst_t *xim_inst = dpyinfo->xim_callback_data;
-
+
if (dpyinfo->display)
{
Bool ret = XUnregisterIMInstantiateCallback
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r116894: In x_new_font don't calculate non-toolkit scrollbar width from font width (Bug#17163).,
Martin Rudalics <=