livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
leyla_linden 2011-10-12 17:19:25 -07:00
parent fbd883ab36 17731c50a8
commit 3e55263e33
11 changed files with 119 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llbutton.cpp
View File

@ -548,7 +548,7 @@ void LLButton::setHighlight(bool b)
BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
{
if (isInEnabledChain()
&& (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() != this))
&& (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() == this))
mNeedsHighlight = TRUE;
if (!childrenHandleHover(x, y, mask))

23
indra/llui/llfloater.cpp
View File

@ -247,6 +247,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
mHeaderHeight(p.header_height),
mLegacyHeaderHeight(p.legacy_header_height),
mMinimized(FALSE),
mVisibleWhenMinimized(TRUE),
mForeground(FALSE),
mFirstLook(TRUE),
mButtonScale(1.0f),
@ -1406,6 +1407,17 @@ void LLFloater::removeDependentFloater(LLFloater* floaterp)
floaterp->mDependeeHandle = LLHandle<LLFloater>();
}
void LLFloater::setVisibleWhenMinimized(bool visible)
{
mVisibleWhenMinimized = visible;
if (visible && isMinimized())
{
// restack in minimized stack
setMinimized(FALSE);
setMinimized(TRUE);
}
}
BOOL LLFloater::offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButton index)
{
if( mButtonsEnabled[index] )
@ -1782,11 +1794,14 @@ void LLFloater::draw()
}
if (isMinimized())
{
for (S32 i = 0; i < BUTTON_COUNT; i++)
if (mVisibleWhenMinimized)
{
drawChild(mButtons[i]);
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
drawChild(mButtons[i]);
}
drawChild(mDragHandle);
}
drawChild(mDragHandle);
}
else
{
@ -2441,7 +2456,7 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
{
// Examine minimized children.
LLFloater* floater = (LLFloater*)((LLView*)*child_it);
if(floater->isMinimized())
if(floater->isMinimized() && floater->getVisibleWhenMinimized())
{
LLRect r = floater->getRect();
if((r.mBottom < (row + floater_header_size))

7
indra/llui/llfloater.h
View File

@ -212,8 +212,10 @@ public:
void addDependentFloater(LLFloater* dependent, BOOL reposition = TRUE);
void addDependentFloater(LLHandle<LLFloater> dependent_handle, BOOL reposition = TRUE);
LLFloater* getDependee() { return (LLFloater*)mDependeeHandle.get(); }
void removeDependentFloater(LLFloater* dependent);
BOOL isMinimized() const { return mMinimized; }
void removeDependentFloater(LLFloater* dependent);
BOOL isMinimized() const { return mMinimized; }
void setVisibleWhenMinimized(bool visible);
bool getVisibleWhenMinimized() const { return mVisibleWhenMinimized;}
/// isShown() differs from getVisible() in that isShown() also considers
/// isMinimized(). isShown() is true only if visible and not minimized.
bool isShown() const;
@ -420,6 +422,7 @@ private:
S32 mLegacyHeaderHeight;// HACK see initFloaterXML()
BOOL mMinimized;
bool mVisibleWhenMinimized;
BOOL mForeground;
LLHandle<LLFloater> mDependeeHandle;

5
indra/llui/lltoolbar.cpp
View File

@ -871,7 +871,10 @@ void LLToolBarButton::onMouseEnter(S32 x, S32 y, MASK mask)
LLUICtrl::onMouseEnter(x, y, mask);
// Always highlight toolbar buttons, even if they are disabled
mNeedsHighlight = TRUE;
if (!gFocusMgr.getMouseCapture() || gFocusMgr.getMouseCapture() == this)
{
mNeedsHighlight = TRUE;
}
}
void LLToolBarButton::onMouseCaptureLost()

17
indra/newview/llfloatertoybox.cpp
View File

@ -30,12 +30,13 @@
#include "llbutton.h"
#include "llcommandmanager.h"
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llpanel.h"
#include "lltoolbar.h"
#include "lltoolbarview.h"
#include "lltrans.h"
LLFloaterToybox::LLFloaterToybox(const LLSD& key)
: LLFloater(key)
, mBtnRestoreDefaults(NULL)
@ -113,9 +114,21 @@ void LLFloaterToybox::draw()
LLFloater::draw();
}
static bool finish_restore_toybox(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0)
{
LLToolBarView::loadDefaultToolbars();
}
return false;
}
static LLNotificationFunctorRegistration finish_restore_toybox_reg("ConfirmRestoreToybox", finish_restore_toybox);
void LLFloaterToybox::onBtnRestoreDefaults()
{
LLToolBarView::loadDefaultToolbars();
LLNotificationsUtil::add("ConfirmRestoreToybox");
}
BOOL LLFloaterToybox::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,

30
indra/newview/llviewermenu.cpp
View File

@ -3766,9 +3766,37 @@ class LLViewToggleUI : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
gViewerWindow->setUIVisibility(!gViewerWindow->getUIVisibility());
LLNotification::Params params("ConfirmHideUI");
params.functor.function(boost::bind(&LLViewToggleUI::confirm, this, _1, _2));
LLSD substitutions;
#if LL_DARWIN
substitutions["SHORTCUT"] = "Cmd+Shift+U";
#else
substitutions["SHORTCUT"] = "Ctrl+Shift+U";
#endif
params.substitutions = substitutions;
if (gViewerWindow->getUIVisibility())
{
// hiding, so show notification
LLNotifications::instance().add(params);
}
else
{
LLNotifications::instance().forceResponse(params, 0);
}
return true;
}
void confirm(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if (option == 0) // OK
{
gViewerWindow->setUIVisibility(!gViewerWindow->getUIVisibility());
}
}
};
class LLEditDuplicate : public view_listener_t

BIN
indra/newview/skins/default/textures/navbar/separator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

2
indra/newview/skins/default/textures/textures.xml
View File

@ -769,5 +769,5 @@ with the same filename but different name
<texture name="Yellow_Gradient" file_name="windows/yellow_gradient.png"/>
<texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/>
<texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/>
<texture name="NavBar Separator" file_name="navbar/separator.png"/>
</textures>

14
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -24,6 +24,13 @@
function="Floater.Toggle"
parameter="toybox" />
</menu_item_call>
<menu_item_call
label="Hide all controls"
name="Hide UI"
shortcut="control|shift|U">
<menu_item_call.on_click
function="View.ToggleUI" />
</menu_item_call>
<menu_item_call
label="My Dashboard"
name="Manage My Account">
@ -1719,13 +1726,6 @@
<menu_item_call.on_click
function="View.DefaultUISize" />
</menu_item_call>
<menu_item_call
label="Toggle UI"
name="Toggle UI"
shortcut="control|shift|U">
<menu_item_call.on_click
function="View.ToggleUI" />
</menu_item_call>
<!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility. The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
<menu_item_check
label="Show Advanced Menu - legacy shortcut"

28
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4622,6 +4622,20 @@ Are you sure you want to quit?
yestext="Quit"/>
</notification>
<notification
icon="alertmodal.tga"
name="ConfirmRestoreToybox"
type="alertmodal">
<unique/>
Are you sure you want to restore your default buttons and toolbars?
You cannot undo this action.
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="DeleteItems"
@ -7536,6 +7550,20 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
notext="Don't Quit"/>
</notification>
<notification
name="ConfirmHideUI"
label=""
type="alertmodal">
<unique/>
<tag>confirm</tag>
This action will hide all menu items and buttons. To get them back, click [SHORTCUT] again.
<usetemplate
name="okcancelignore"
yestext="OK"
notext="Cancel"
ignoretext="Confirm before hiding UI"/>
</notification>
<global name="UnsupportedGLRequirements">
You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.

10
indra/newview/skins/default/xui/en/panel_navigation_bar.xml
View File

@ -43,6 +43,16 @@
top="0"
height="34"
width="600"/>
<icon
follows="all"
image_name="NavBar Separator"
mouse_opaque="false"
name="separator_image"
scale_image="true"
left="0"
top="0"
width="800"
height="2"/>
<layout_stack
use_border="true"
bevel_style="none"