dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21537) -Cleanup: Add a few sprinkles of coding style

Browse Source
This commit is contained in:
planetmaker
2010-12-18 21:54:09 +00:00
parent 7ff64ba3fa
commit 3448853b55
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/cocoa/wnd_quartz.mm
View File

@@ -470,7 +470,7 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height)
/* We already have a window, just change its size */ /* We already have a window, just change its size */
[ this->window setContentSize:contentRect.size ]; [ this->window setContentSize:contentRect.size ];
// Ensure frame height - title bar height >= view height /* Ensure frame height - title bar height >= view height */
contentRect.size.height = Clamp(height, 0, [ this->window frame ].size.height - 22 /* 22 is the height of title bar of window*/); contentRect.size.height = Clamp(height, 0, [ this->window frame ].size.height - 22 /* 22 is the height of title bar of window*/);
if (this->qzview != nil) { if (this->qzview != nil) {
@@ -593,8 +593,6 @@ void WindowQuartzSubdriver::Draw(bool force_update)
if (force_update) [ this->qzview displayIfNeeded ]; if (force_update) [ this->qzview displayIfNeeded ];
} }
//DrawResizeIcon();
this->num_dirty_rects = 0; this->num_dirty_rects = 0;
} }

8
src/video/cocoa/wnd_quickdraw.mm
View File

@@ -166,7 +166,6 @@ public:
virtual bool IsActive() { return active; } virtual bool IsActive() { return active; }
void SetPortAlphaOpaque(); void SetPortAlphaOpaque();
bool WindowResized(); bool WindowResized();
}; };
@@ -397,13 +396,14 @@ bool WindowQuickdrawSubdriver::SetVideoMode(int width, int height)
} else { } else {
/* We already have a window, just change its size */ /* We already have a window, just change its size */
[ this->window setContentSize:contentRect.size ]; [ this->window setContentSize:contentRect.size ];
/* Ensure frame height - title bar height >= view height */ /* Ensure frame height - title bar height >= view height
contentRect.size.height = Clamp(height, 0, [ this->window frame ].size.height - 22); // 22 is the height of title bar of window * The height of title bar of the window is 22 pixels */
contentRect.size.height = Clamp(height, 0, [ this->window frame ].size.height - 22);
height = contentRect.size.height; height = contentRect.size.height;
[ this->qdview setFrameSize:contentRect.size ]; [ this->qdview setFrameSize:contentRect.size ];
} }
// Update again /* Update again */
this->window_width = width; this->window_width = width;
this->window_height = height; this->window_height = height;