From e8196ca93f24644998777da6b2286920c7709cbe Mon Sep 17 00:00:00 2001 From: angela Date: Thu, 3 Dec 2009 18:38:15 +0800 Subject: EXT-2313 Add auto-close behavior to mini-inspector floater --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- indra/newview/llinspect.cpp | 21 +++++++++++++++++---- indra/newview/llinspect.h | 3 +++ 3 files changed, 32 insertions(+), 5 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d9607e5f6b..fb1aac6e95 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3706,7 +3706,18 @@ Type F32 Value - 0.15 + 0.5 + + InspectorShowTime + + Comment + Stay timing for inspectors + Persist + 1 + Type + F32 + Value + 3.0 InstallLanguage diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp index aa299014ee..c7b8db9635 100644 --- a/indra/newview/llinspect.cpp +++ b/indra/newview/llinspect.cpp @@ -50,16 +50,16 @@ LLInspect::~LLInspect() void LLInspect::draw() { static LLCachedControl FADE_TIME(*LLUI::sSettingGroups["config"], "InspectorFadeTime", 1.f); + static LLCachedControl STAY_TIME(*LLUI::sSettingGroups["config"], "InspectorShowTime", 1.f); if (mOpenTimer.getStarted()) { - F32 alpha = clamp_rescale(mOpenTimer.getElapsedTimeF32(), 0.f, FADE_TIME, 0.f, 1.f); - LLViewDrawContext context(alpha); LLFloater::draw(); - if (alpha == 1.f) + if (mOpenTimer.getElapsedTimeF32() > STAY_TIME) { mOpenTimer.stop(); + mCloseTimer.start(); } - + } else if (mCloseTimer.getStarted()) { @@ -95,3 +95,16 @@ void LLInspect::onFocusLost() mCloseTimer.start(); mOpenTimer.stop(); } + +// virtual +BOOL LLInspect::handleHover(S32 x, S32 y, MASK mask) +{ + mOpenTimer.pause(); + return LLView::handleHover(x, y, mask); +} + +// virtual +void LLInspect::onMouseLeave(S32 x, S32 y, MASK mask) +{ + mOpenTimer.unpause(); +} diff --git a/indra/newview/llinspect.h b/indra/newview/llinspect.h index a461c2fa16..731e99534b 100644 --- a/indra/newview/llinspect.h +++ b/indra/newview/llinspect.h @@ -46,6 +46,9 @@ public: /// Inspectors have a custom fade-in/fade-out animation /*virtual*/ void draw(); + /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); + /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); + /// Start open animation /*virtual*/ void onOpen(const LLSD& avatar_id); -- cgit v1.2.3 From a28de873cea85bdedcac20a164d7bd2012a4d5bc Mon Sep 17 00:00:00 2001 From: angela Date: Thu, 3 Dec 2009 22:28:53 +0800 Subject: EXT-2575 [BSI] Deleting content inside a prim from build floater deletes prim, rather than content --- indra/newview/llpanelobjectinventory.cpp | 20 ++++++++++++++++++++ indra/newview/llpanelobjectinventory.h | 3 +++ .../skins/default/xui/en/menu_text_editor.xml | 8 ++++---- 3 files changed, 27 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 342d2bc739..7b0eb8c2d2 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1695,6 +1695,7 @@ void LLPanelObjectInventory::updateInventory() } mFolders->requestArrange(); + //LLEditMenuHandler::gEditMenuHandler = mFolders; mInventoryNeedsUpdate = FALSE; } @@ -1940,3 +1941,22 @@ void LLPanelObjectInventory::idle(void* user_data) self->updateInventory(); } } + +void LLPanelObjectInventory::onFocusLost() +{ + // inventory no longer handles cut/copy/paste/delete + if (LLEditMenuHandler::gEditMenuHandler == mFolders) + { + LLEditMenuHandler::gEditMenuHandler = NULL; + } + + LLPanel::onFocusLost(); +} + +void LLPanelObjectInventory::onFocusReceived() +{ + // inventory now handles cut/copy/paste/delete + LLEditMenuHandler::gEditMenuHandler = mFolders; + + LLPanel::onFocusReceived(); +} \ No newline at end of file diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h index 6722bb212e..bc339ece35 100644 --- a/indra/newview/llpanelobjectinventory.h +++ b/indra/newview/llpanelobjectinventory.h @@ -74,6 +74,9 @@ public: virtual void deleteAllChildren(); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg); + /*virtual*/ void onFocusLost(); + /*virtual*/ void onFocusReceived(); + static void idle(void* user_data); protected: diff --git a/indra/newview/skins/default/xui/en/menu_text_editor.xml b/indra/newview/skins/default/xui/en/menu_text_editor.xml index 7c9e6f0796..ecd96088e7 100644 --- a/indra/newview/skins/default/xui/en/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/en/menu_text_editor.xml @@ -32,10 +32,10 @@ function="Edit.EnablePaste" /> + label="Delete" + layout="topleft" + name="Delete" + shortcut="Del"> Date: Fri, 4 Dec 2009 12:26:46 +0800 Subject: EXT-1640 Application Icon Misaligned on OSX Installer Dialog --- .../installers/darwin/firstlook-dmg/_DS_Store | Bin 12292 -> 12292 bytes .../installers/darwin/publicnightly-dmg/_DS_Store | Bin 12292 -> 12292 bytes .../newview/installers/darwin/release-dmg/_DS_Store | Bin 12292 -> 12292 bytes .../darwin/releasecandidate-dmg/_DS_Store | Bin 12292 -> 12292 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/installers/darwin/firstlook-dmg/_DS_Store b/indra/newview/installers/darwin/firstlook-dmg/_DS_Store index 408a4d4992..9d9fd897e7 100644 Binary files a/indra/newview/installers/darwin/firstlook-dmg/_DS_Store and b/indra/newview/installers/darwin/firstlook-dmg/_DS_Store differ diff --git a/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store b/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store index b901e46b65..9d9fd897e7 100644 Binary files a/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store and b/indra/newview/installers/darwin/publicnightly-dmg/_DS_Store differ diff --git a/indra/newview/installers/darwin/release-dmg/_DS_Store b/indra/newview/installers/darwin/release-dmg/_DS_Store index 2c179b11a4..9d9fd897e7 100644 Binary files a/indra/newview/installers/darwin/release-dmg/_DS_Store and b/indra/newview/installers/darwin/release-dmg/_DS_Store differ diff --git a/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store index 309c8adaaa..9d9fd897e7 100644 Binary files a/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store and b/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store differ -- cgit v1.2.3 From 6dcdcb191111a4ac2ea423d1d3e21673bb930b1d Mon Sep 17 00:00:00 2001 From: angela Date: Fri, 4 Dec 2009 13:22:17 +0800 Subject: Deleting content inside a prim from build floater deletes prim, rather than content EXT-2575 --- indra/newview/llpanelobjectinventory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 7b0eb8c2d2..79e84efd5f 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1695,8 +1695,8 @@ void LLPanelObjectInventory::updateInventory() } mFolders->requestArrange(); - //LLEditMenuHandler::gEditMenuHandler = mFolders; mInventoryNeedsUpdate = FALSE; + LLEditMenuHandler::gEditMenuHandler = mFolders; } // *FIX: This is currently a very expensive operation, because we have -- cgit v1.2.3