Created
May 27, 2013 21:40
-
-
Save LiruMouse/5659229 to your computer and use it in GitHub Desktop.
Mac fix?
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp | |
index 8d4820d..fb1aa99 100644 | |
--- a/indra/newview/lltoolbar.cpp | |
+++ b/indra/newview/lltoolbar.cpp | |
@@ -84,8 +84,8 @@ | |
class LLFakeResizeHandle : public LLResizeHandle | |
{ | |
public: | |
- LLFakeResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM ) | |
- : LLResizeHandle(name, rect, min_width, min_height, corner ) | |
+ LLFakeResizeHandle(const LLResizeHandle::Params& p) | |
+ : LLResizeHandle(p) | |
{ | |
} | |
@@ -183,8 +183,13 @@ BOOL LLToolBar::postBuild() | |
#if LL_DARWIN | |
if(mResizeHandle == NULL) | |
{ | |
- LLRect rect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT); | |
- mResizeHandle = new LLFakeResizeHandle(std::string(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT); | |
+ LLResizeHandle::Params p; | |
+ p.rect(LLRect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT)); | |
+ p.name(std::string("")); | |
+ p.min_width(RESIZE_HANDLE_WIDTH); | |
+ p.min_height(RESIZE_HANDLE_HEIGHT); | |
+ p.corner(RIGHT_BOTTOM); | |
+ mResizeHandle = new LLFakeResizeHandle(p); | |
this->addChildInBack(mResizeHandle); | |
LLLayoutStack* toolbar_stack = getChild<LLLayoutStack>("toolbar_stack"); | |
toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight()); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment