made floater close/minimize buttons "chrome" so they don't take keyboard focus
removed LLHudView::colorFromType which was unused reviewed by Jamesmeow-7.2.2
parent
bfec29d46f
commit
a6b6ca9a24
|
|
@ -1839,6 +1839,7 @@ void LLFloater::buildButtons()
|
|||
p.follows.flags(FOLLOWS_TOP|FOLLOWS_RIGHT);
|
||||
p.tool_tip(sButtonToolTips[i]);
|
||||
p.scale_image(true);
|
||||
p.chrome(true);
|
||||
|
||||
LLButton* buttonp = LLUICtrlFactory::create<LLButton>(p);
|
||||
addChild(buttonp);
|
||||
|
|
|
|||
|
|
@ -71,20 +71,6 @@ void LLHUDView::draw()
|
|||
LLView::draw();
|
||||
}
|
||||
|
||||
|
||||
// public
|
||||
const LLColor4& LLHUDView::colorFromType(S32 type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case 0:
|
||||
return LLColor4::green;
|
||||
default:
|
||||
return LLColor4::black;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*virtual*/
|
||||
BOOL LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,8 +47,6 @@ public:
|
|||
|
||||
virtual void draw();
|
||||
|
||||
const LLColor4& colorFromType(S32 type);
|
||||
|
||||
protected:
|
||||
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -145,7 +145,6 @@
|
|||
#include "llmenucommands.h"
|
||||
#include "llmenugl.h"
|
||||
#include "llmimetypes.h"
|
||||
#include "llmorphview.h"
|
||||
#include "llmoveview.h"
|
||||
#include "llmutelist.h"
|
||||
#include "llnotify.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue