[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100678: Rename FRAME_NS_TOOLBAR_HEIG
From: |
Jan D |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100678: Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT to aid common code. |
Date: |
Thu, 01 Jul 2010 14:16:33 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100678
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-01 14:16:33 +0200
message:
Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT to aid common code.
* nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update
FRAME_TOOLBAR_HEIGHT.
* nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH
* nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed
FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
modified:
src/ChangeLog
src/nsmenu.m
src/nsterm.h
src/nsterm.m
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-07-01 10:45:26 +0000
+++ b/src/ChangeLog 2010-07-01 12:16:33 +0000
@@ -1,5 +1,13 @@
2010-07-01 Jan Djärv <address@hidden>
+ * nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed
+ FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
+
+ * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH
+
+ * nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update
+ FRAME_TOOLBAR_HEIGHT.
+
* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
BLOCK/UNBLOCK_INPUT so asserts don't trigger.
=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m 2010-07-01 10:45:26 +0000
+++ b/src/nsmenu.m 2010-07-01 12:16:33 +0000
@@ -1001,6 +1001,7 @@
{
BLOCK_INPUT;
[[FRAME_NS_VIEW (f) toolbar] setVisible: NO];
+ FRAME_TOOLBAR_HEIGHT (f) = 0;
UNBLOCK_INPUT;
}
@@ -1011,7 +1012,9 @@
--------------------------------------------------------------------------
*/
{
int i;
- EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar];
+ EmacsView *view = FRAME_NS_VIEW (f);
+ NSWindow *window = [view window];
+ EmacsToolbar *toolbar = [view toolbar];
BLOCK_INPUT;
[toolbar clearActive];
@@ -1097,6 +1100,9 @@
[newDict release];
}
+ FRAME_TOOLBAR_HEIGHT (f) =
+ NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
+ - FRAME_NS_TITLEBAR_HEIGHT (f);
UNBLOCK_INPUT;
}
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2010-03-31 14:27:50 +0000
+++ b/src/nsterm.h 2010-07-01 12:16:33 +0000
@@ -606,7 +606,7 @@
#define NS_FACE_FOREGROUND(f) ((f)->foreground)
#define NS_FACE_BACKGROUND(f) ((f)->background)
#define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height)
-#define FRAME_NS_TOOLBAR_HEIGHT(f) ((f)->output_data.ns->toolbar_height)
+#define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.ns->toolbar_height)
#define FONT_WIDTH(f) ((f)->max_width)
#define FONT_HEIGHT(f) ((f)->height)
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2010-06-02 04:29:53 +0000
+++ b/src/nsterm.m 2010-07-01 12:16:33 +0000
@@ -1138,15 +1138,15 @@
/* NOTE: previously this would generate wrong result if toolbar not
yet displayed and fixing toolbar_height=32 helped, but
now (200903) seems no longer needed */
- FRAME_NS_TOOLBAR_HEIGHT (f) =
+ FRAME_TOOLBAR_HEIGHT (f) =
NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
- FRAME_NS_TITLEBAR_HEIGHT (f);
else
- FRAME_NS_TOOLBAR_HEIGHT (f) = 0;
+ FRAME_TOOLBAR_HEIGHT (f) = 0;
wr.size.width = pixelwidth + f->border_width;
wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f)
- + FRAME_NS_TOOLBAR_HEIGHT (f);
+ + FRAME_TOOLBAR_HEIGHT (f);
/* constrain to screen if we can */
if (screen)
@@ -4894,16 +4894,16 @@
rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (emacsframe, frameSize.height
#ifdef NS_IMPL_GNUSTEP
- FRAME_NS_TITLEBAR_HEIGHT (emacsframe) + 3
- - FRAME_NS_TOOLBAR_HEIGHT (emacsframe));
+ - FRAME_TOOLBAR_HEIGHT (emacsframe));
#else
- FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
- - FRAME_NS_TOOLBAR_HEIGHT (emacsframe));
+ - FRAME_TOOLBAR_HEIGHT (emacsframe));
#endif
if (rows < MINHEIGHT)
rows = MINHEIGHT;
frameSize.height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (emacsframe, rows)
+ FRAME_NS_TITLEBAR_HEIGHT (emacsframe)
- + FRAME_NS_TOOLBAR_HEIGHT (emacsframe);
+ + FRAME_TOOLBAR_HEIGHT (emacsframe);
#ifdef NS_IMPL_COCOA
{
/* this sets window title to have size in it; the wm does this under GS */
@@ -5114,7 +5114,7 @@
[toggleButton setTarget: self];
[toggleButton setAction: @selector (toggleToolbar: )];
#endif
- FRAME_NS_TOOLBAR_HEIGHT (f) = 0;
+ FRAME_TOOLBAR_HEIGHT (f) = 0;
tem = f->icon_name;
if (!NILP (tem))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100678: Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT to aid common code.,
Jan D <=