@@ -161,26 +161,11 @@ // Button click callbacks private function menuItemClicked(event:FBEvent):void { addTab(event.data); - hideMenu(); + menu.hide(); } private function menuButtonClicked(event:MouseEvent):void { - showMenu(); - } - - // Menu visibility - public function showMenu():void { - menu.visible = true; - stage.addEventListener(MouseEvent.CLICK, stageClicked, true); - } - - public function hideMenu():void { - menu.visible = false; - stage.removeEventListener(MouseEvent.CLICK, stageClicked, true); - } - - private function stageClicked(event:MouseEvent):void { - hideMenu(); + menu.show(); } // Filter fetching fbair/gui/filters/FiltersBar.mxml @@ -16,14 +16,16 @@ <!-- This contains our list of filters in a menu --> <mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml" xmlns:filters="fbair.gui.filters.*" + xmlns:util="fbair.util.display.*" mouseEnabled="false" > <mx:Metadata> [Event(name="itemClick", type="fb.FBEvent")] </mx:Metadata> - <mx:VBox styleName="filterMenuItems" > + <mx:VBox id="filterMenuItems" + styleName="filterMenuItems" > - <mx:VBox> + <mx:VBox width="100%" > <mx:Repeater id="rp" dataProvider="{visibleItems}" recycleChildren="true" > @@ -33,13 +35,17 @@ </mx:Repeater> </mx:VBox> - <mx:Label id="moreBtn" - text="MOORE!?" - click="moreClicked(event)" /> + <util:LinkLabel id="moreBtn" + styleName="moreBtn" + text="More" + visible="{!showExtendedItems}" + includeInLayout="{!showExtendedItems}" + mouseUp="showExtendedItems = true" /> <mx:VBox id="hiddenFilterMenuItems" - visible="false" - includeInLayout="false" > + visible="{showExtendedItems}" + includeInLayout="{showExtendedItems}" + width="100%" > <mx:Repeater id="hiddenrp" dataProvider="{invisibleItems}" recycleChildren="true" > @@ -64,6 +70,8 @@ [Bindable] private var visibleItems:ArrayCollection; [Bindable] private var invisibleItems:ArrayCollection; + [Bindable] public var showExtendedItems:Boolean = false; + override public function set data(new_data:Object):void { visibleItems = new ArrayCollection(); invisibleItems = new ArrayCollection(); @@ -75,9 +83,20 @@ } } - private function moreClicked(event:Event):void { - moreBtn.visible = moreBtn.includeInLayout = false; - hiddenFilterMenuItems.visible = hiddenFilterMenuItems.includeInLayout = true; + public function show():void { + visible = true; + stage.addEventListener(MouseEvent.CLICK, stageClicked, true); + } + + public function hide():void { + visible = false; + showExtendedItems = false; + stage.removeEventListener(MouseEvent.CLICK, stageClicked, true); + } + + private function stageClicked(event:MouseEvent):void { + if (filterMenuItems.hitTestPoint(event.stageX, event.stageY)) return; + hide(); } private function itemClicked(event:Event):void { fbair/gui/filters/FiltersMenu.mxml @@ -71,6 +71,11 @@ borderSkin: Embed(source='../assets/tab_over.png',scaleGridTop='3',scaleGridLeft='2',scaleGridBottom='4',scaleGridRight='3'); } +.moreBtn { + paddingLeft: 22; + fontSize: 9; +} + .tabDeleteButton { upSkin: Embed(source='../assets/delete_dark.png'); disabledSkin: Embed(source='../assets/delete_dark_over.png'); fbair/styles/filters.css 236fd449bd0c384e2264390da4a11a82634259ca Lee Byron leebyron@lbyron.local http://github.com/jubishop/Facebook-for-Adobe-AIR/commit/2b718b2e1800343edf10d7339e3522397bf4eda8 2b718b2e1800343edf10d7339e3522397bf4eda8 2009-05-13T20:12:50-07:00 2009-05-13T20:12:50-07:00 better more filters behavior and looks dac537030c12237b2bd7755da65ee049e868a7e7 Lee Byron leebyron@lbyron.local