feat(dens): Back, Front and Auto beside the selected den item

The layer controls move from the den editor's top corner into the selected
item's own buttons (DenItemHolder), under the flip and link buttons'
column: Back, Front and Auto (natural depth). They show only for an item
that can be stacked, reorder it on screen at once, and a mouse-up between
the item and its buttons no longer deselects it.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
SnipzilandClaude Opus 5.5 committed 2026-10-21 22:42:11 -04:00
1 parent 3139384ef3
commit 9985ae7625
2 files changed
+134 -82

No files matched your search

-77
View File
@@ -15,13 +15,10 @@ package gui
import den.DenStateItem; import den.DenStateItem;
import den.DenXtCommManager; import den.DenXtCommManager;
import flash.display.MovieClip; import flash.display.MovieClip;
import flash.display.Sprite;
import flash.events.Event; import flash.events.Event;
import flash.events.MouseEvent; import flash.events.MouseEvent;
import flash.events.TimerEvent; import flash.events.TimerEvent;
import flash.geom.Point; import flash.geom.Point;
import flash.text.TextField;
import flash.text.TextFormat;
import flash.utils.Timer; import flash.utils.Timer;
import gui.itemWindows.ItemWindowOriginal; import gui.itemWindows.ItemWindowOriginal;
import localization.LocalizationManager; import localization.LocalizationManager;
@@ -143,8 +140,6 @@ package gui
private var _itemSetEvent:DenItemHolderEvent; private var _itemSetEvent:DenItemHolderEvent;
private var _layerControls:Sprite;
public function DenEditor() public function DenEditor()
{ {
super(); super();
@@ -162,7 +157,6 @@ package gui
_roomMgr = RoomManagerWorld.instance; _roomMgr = RoomManagerWorld.instance;
_denItemHolder = _roomMgr.denItemHolder; _denItemHolder = _roomMgr.denItemHolder;
_guiLayer.addChild(_denEditor); _guiLayer.addChild(_denEditor);
createLayerControls();
initAssetVisibility(); initAssetVisibility();
setupPlayerItems(); setupPlayerItems();
DenXtCommManager.denEditorDIResponseCallback = diResponseCallback; DenXtCommManager.denEditorDIResponseCallback = diResponseCallback;
@@ -176,7 +170,6 @@ package gui
_denItemHolder.removeEventListener("OnItemRemoved",onDenItemRemoved); _denItemHolder.removeEventListener("OnItemRemoved",onDenItemRemoved);
_denItemHolder.removeEventListener("OnSaveState",onDenSaveState); _denItemHolder.removeEventListener("OnSaveState",onDenSaveState);
removeListeners(); removeListeners();
destroyLayerControls();
_guiLayer.removeChild(_denEditor); _guiLayer.removeChild(_denEditor);
if(_denLockPopup) if(_denLockPopup)
{ {
@@ -1203,76 +1196,6 @@ package gui
_roomMgr.spawnNewDenItem(_loc3_); _roomMgr.spawnNewDenItem(_loc3_);
} }
// Small controls added at runtime so every den item can be stacked
// deliberately, instead of relying solely on where its feet land.
private function createLayerControls() : void
{
_layerControls = new Sprite();
_layerControls.x = _denEditor.width - 258;
_layerControls.y = 12;
_layerControls.addChild(makeLayerLabel("Selected item layer",0,0,230,22,13,16774041));
addLayerButton("Send behind",0,onSendBehind);
addLayerButton("Bring on top",116,onBringOnTop);
addLayerButton("Use natural depth",0,onResetLayer,62,230,30);
_denEditor.addChild(_layerControls);
}
private function addLayerButton(param1:String, param2:Number, param3:Function, param4:Number = 26, param5:Number = 110, param6:Number = 30) : void
{
var _loc6_:Sprite = new Sprite();
_loc6_.x = param2;
_loc6_.y = param4;
_loc6_.buttonMode = true;
_loc6_.mouseChildren = false;
_loc6_.graphics.beginFill(5986842,0.96);
_loc6_.graphics.drawRoundRect(0,0,param5,param6,8,8);
_loc6_.graphics.endFill();
_loc6_.addChild(makeLayerLabel(param1,0,5,param5,param6 - 5,12,16777215));
_loc6_.addEventListener("mouseDown",param3,false,0,true);
_layerControls.addChild(_loc6_);
}
private function makeLayerLabel(param1:String, param2:Number, param3:Number, param4:Number, param5:Number, param6:int, param7:uint) : TextField
{
var _loc8_:TextField = new TextField();
_loc8_.x = param2;
_loc8_.y = param3;
_loc8_.width = param4;
_loc8_.height = param5;
_loc8_.selectable = false;
_loc8_.mouseEnabled = false;
_loc8_.defaultTextFormat = new TextFormat("Arial",param6,param7,true,null,null,null,null,"center");
_loc8_.text = param1;
return _loc8_;
}
private function onSendBehind(param1:MouseEvent) : void
{
param1.stopImmediatePropagation();
_denItemHolder.sendSelectedBehind();
}
private function onBringOnTop(param1:MouseEvent) : void
{
param1.stopImmediatePropagation();
_denItemHolder.bringSelectedToFront();
}
private function onResetLayer(param1:MouseEvent) : void
{
param1.stopImmediatePropagation();
_denItemHolder.resetSelectedStacking();
}
private function destroyLayerControls() : void
{
if(_layerControls && _layerControls.parent)
{
_layerControls.parent.removeChild(_layerControls);
}
_layerControls = null;
}
private function onClose(param1:MouseEvent) : void private function onClose(param1:MouseEvent) : void
{ {
SBTracker.pop(); SBTracker.pop();
+134 -5
View File
@@ -22,6 +22,8 @@ package room
import flash.geom.Matrix; import flash.geom.Matrix;
import flash.geom.Point; import flash.geom.Point;
import flash.geom.Rectangle; import flash.geom.Rectangle;
import flash.text.TextField;
import flash.text.TextFormat;
import flash.utils.Dictionary; import flash.utils.Dictionary;
import game.MinigameManager; import game.MinigameManager;
import gui.AvatarEditor; import gui.AvatarEditor;
@@ -65,6 +67,15 @@ package room
private var _linkBtn:MovieClip; private var _linkBtn:MovieClip;
// These are deliberately part of the selected item's action cluster,
// not the den editor chrome. That keeps them out of the way of the
// inventory and makes their scope obvious, as in the original editor.
private var _sendBehindBtn:Sprite;
private var _bringToFrontBtn:Sprite;
private var _naturalDepthBtn:Sprite;
private var _themePos:Point; private var _themePos:Point;
private var _isWaitingToSetItemsForFirstTime:Boolean; private var _isWaitingToSetItemsForFirstTime:Boolean;
@@ -102,6 +113,9 @@ package room
_flipBtnVer.addEventListener("mouseDown",onFlipBtn,false,0,true); _flipBtnVer.addEventListener("mouseDown",onFlipBtn,false,0,true);
_linkBtn = GETDEFINITIONBYNAME("portalLinkBtnCont"); _linkBtn = GETDEFINITIONBYNAME("portalLinkBtnCont");
_linkBtn.addEventListener("mouseDown",onLinkBtn,false,0,true); _linkBtn.addEventListener("mouseDown",onLinkBtn,false,0,true);
_sendBehindBtn = makeLayerButton("Back",onSendBehindBtn);
_bringToFrontBtn = makeLayerButton("Front",onBringToFrontBtn);
_naturalDepthBtn = makeLayerButton("Auto",onNaturalDepthBtn);
release(); release();
_lastItemInvId = -1; _lastItemInvId = -1;
} }
@@ -149,10 +163,9 @@ package room
return _dragItem != null; return _dragItem != null;
} }
// The original editor only sorted furniture from its y position. These // The original editor only sorted furniture from its y position. Bits
// helpers give the replacement editor an explicit, persisted choice. // 2-3 of `flipped` are unused by the game's flip code, so they safely
// Bits 2-3 of `flipped` are unused by the game's flip code, so the // persist a selected item's deliberate stacking choice.
// normal horizontal/vertical flip bits remain intact in bits 0-1.
public function sendSelectedBehind() : Boolean public function sendSelectedBehind() : Boolean
{ {
return setSelectedStacking(1); return setSelectedStacking(1);
@@ -170,7 +183,7 @@ package room
private function setSelectedStacking(param1:int) : Boolean private function setSelectedStacking(param1:int) : Boolean
{ {
if(_dragItem == null || _dragItem.layerId == 1 || isTheme(_dragItem.sortCatId) || _dragItem.sortCatId == 4) if(!canSetSelectedStacking())
{ {
return false; return false;
} }
@@ -178,11 +191,67 @@ package room
if(_dragItem.denItemHelper && _dragItem.denItemHelper.displayObject) if(_dragItem.denItemHelper && _dragItem.denItemHelper.displayObject)
{ {
_dragItem.denItemHelper.displayObject.name = String(_dragItem.denItemHelper.sortOffset); _dragItem.denItemHelper.displayObject.name = String(_dragItem.denItemHelper.sortOffset);
// SortLayer will settle on the saved offset at its next heartbeat;
// set the visible order now so the control feels immediate.
if(param1 == 1)
{
_dragItem.denItemHelper.displayObject.parent.setChildIndex(_dragItem.denItemHelper.displayObject,0);
}
else if(param1 == 2)
{
_dragItem.denItemHelper.displayObject.parent.setChildIndex(_dragItem.denItemHelper.displayObject,_dragItem.denItemHelper.displayObject.parent.numChildren - 1);
}
} }
saveState(_dragItem.invIdx); saveState(_dragItem.invIdx);
return true; return true;
} }
private function canSetSelectedStacking() : Boolean
{
return _roomMode == 1 && _dragItem != null && _dragItem.layerId != 1 && !isTheme(_dragItem.sortCatId) && _dragItem.sortCatId != 4;
}
private function makeLayerButton(param1:String, param2:Function) : Sprite
{
var _loc3_:Sprite = new Sprite();
var _loc4_:TextField = new TextField();
_loc3_.buttonMode = true;
_loc3_.mouseChildren = false;
_loc3_.graphics.beginFill(2398294,0.96);
_loc3_.graphics.drawRoundRect(0,0,42,24,8,8);
_loc3_.graphics.endFill();
_loc3_.graphics.lineStyle(1,16774041,0.9);
_loc3_.graphics.drawRoundRect(0,0,42,24,8,8);
_loc4_.width = 42;
_loc4_.height = 20;
_loc4_.y = 3;
_loc4_.selectable = false;
_loc4_.mouseEnabled = false;
_loc4_.defaultTextFormat = new TextFormat("Arial",9,16777215,true,null,null,null,null,"center");
_loc4_.text = param1;
_loc3_.addChild(_loc4_);
_loc3_.addEventListener("mouseDown",param2,false,0,true);
return _loc3_;
}
private function onSendBehindBtn(param1:MouseEvent) : void
{
param1.stopImmediatePropagation();
sendSelectedBehind();
}
private function onBringToFrontBtn(param1:MouseEvent) : void
{
param1.stopImmediatePropagation();
bringSelectedToFront();
}
private function onNaturalDepthBtn(param1:MouseEvent) : void
{
param1.stopImmediatePropagation();
resetSelectedStacking();
}
public function get lastSelectedItem() : DenStateItem public function get lastSelectedItem() : DenStateItem
{ {
return _lastSelectedItem; return _lastSelectedItem;
@@ -618,6 +687,7 @@ package room
{ {
_linkBtn.parent.removeChild(_linkBtn); _linkBtn.parent.removeChild(_linkBtn);
} }
removeLayerButtons();
if(_itemFilter) if(_itemFilter)
{ {
if(_itemFilter.denItemHelper.displayObject) if(_itemFilter.denItemHelper.displayObject)
@@ -664,6 +734,13 @@ package room
} }
else else
{ {
// The room treats a mouse-up over empty space as a deselect. The
// selected item's action cluster lives in that empty space, so
// keep the selection while the pointer crosses into its buttons.
if(_dragItem && isOverLayerActionArea(param1,param2))
{
return;
}
if(_dragItem && _dragItem.specialType == 1) if(_dragItem && _dragItem.specialType == 1)
{ {
_loc6_ = hitTest(param1,param2); _loc6_ = hitTest(param1,param2);
@@ -976,6 +1053,7 @@ package room
BuddyList.closeWorldBuddyList(); BuddyList.closeWorldBuddyList();
} }
} }
updateLayerButtons();
if(_itemFilter != _dragItem) if(_itemFilter != _dragItem)
{ {
if(_itemFilter) if(_itemFilter)
@@ -1005,6 +1083,7 @@ package room
_linkBtn.parent.removeChild(_linkBtn); _linkBtn.parent.removeChild(_linkBtn);
BuddyList.closeWorldBuddyList(); BuddyList.closeWorldBuddyList();
} }
removeLayerButtons();
if(_itemFilter) if(_itemFilter)
{ {
if(_itemFilter.denItemHelper.displayObject) if(_itemFilter.denItemHelper.displayObject)
@@ -1026,9 +1105,59 @@ package room
_flipBtnVer.y = param2 + 90; _flipBtnVer.y = param2 + 90;
_linkBtn.x = param1 + 15; _linkBtn.x = param1 + 15;
_linkBtn.y = param2 + 125; _linkBtn.y = param2 + 125;
_sendBehindBtn.x = param1 + 42;
_sendBehindBtn.y = param2;
_bringToFrontBtn.x = param1 + 42;
_bringToFrontBtn.y = param2 + 27;
_naturalDepthBtn.x = param1 + 42;
_naturalDepthBtn.y = param2 + 54;
BuddyList.updateWorldBuddyListPosition(_linkBtn); BuddyList.updateWorldBuddyListPosition(_linkBtn);
} }
private function updateLayerButtons() : void
{
if(!canSetSelectedStacking())
{
removeLayerButtons();
return;
}
if(_sendBehindBtn.parent != _layerManager.room_chat)
{
_layerManager.room_chat.addChild(_sendBehindBtn);
_layerManager.room_chat.addChild(_bringToFrontBtn);
_layerManager.room_chat.addChild(_naturalDepthBtn);
}
}
private function removeLayerButtons() : void
{
if(_sendBehindBtn.parent)
{
_sendBehindBtn.parent.removeChild(_sendBehindBtn);
}
if(_bringToFrontBtn.parent)
{
_bringToFrontBtn.parent.removeChild(_bringToFrontBtn);
}
if(_naturalDepthBtn.parent)
{
_naturalDepthBtn.parent.removeChild(_naturalDepthBtn);
}
}
private function isOverLayerActionArea(param1:Number, param2:Number) : Boolean
{
var _loc3_:Rectangle = null;
if(_sendBehindBtn.parent == null)
{
return false;
}
// Treat the item and its controls as one continuous selection area.
// This bridges any empty pixels between a large item and its buttons.
_loc3_ = _dragItem.denItemHelper.displayObject.getBounds(_layerManager.room_avatars);
return param1 >= Math.min(_loc3_.left,_sendBehindBtn.x) - 12 && param1 <= Math.max(_loc3_.right,_sendBehindBtn.x + _sendBehindBtn.width) + 12 && param2 >= Math.min(_loc3_.top,_sendBehindBtn.y) - 12 && param2 <= Math.max(_loc3_.bottom,_naturalDepthBtn.y + _naturalDepthBtn.height) + 12;
}
private function onCloseBtn(param1:Event) : void private function onCloseBtn(param1:Event) : void
{ {
var _loc2_:DenItemHolderEvent = null; var _loc2_:DenItemHolderEvent = null;