diff options
author | Rui Marinho <me@ruimarinho.net> | 2017-01-26 15:33:15 +0000 |
---|---|---|
committer | Kangho Hur <kangho.hur@samsung.com> | 2017-03-24 13:15:53 +0900 |
commit | 30ff03b0a6c62aade8cc2b347f0e316e9709a8ce (patch) | |
tree | d7e490c28c1be486d4a74d94228221191f0fe5da /Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs | |
parent | 4ad3748724c4c36e99fa55e8dc8c2626aa27625b (diff) | |
download | xamarin-forms-30ff03b0a6c62aade8cc2b347f0e316e9709a8ce.tar.gz xamarin-forms-30ff03b0a6c62aade8cc2b347f0e316e9709a8ce.tar.bz2 xamarin-forms-30ff03b0a6c62aade8cc2b347f0e316e9709a8ce.zip |
MacOS (#650)
* [MacOS] Add SwitchRenderer
* [MacOS] Add TimePickerRenderer
* [MacOS] Cleanup TimePcikerRender
* [MacOS] Add WebViewRenderer
* [MacOS] Add Javascript evaluate to webview
* [MacOS] Fix build error on WebViewRenderer
* [MacOS] Add Base and TextCell renderers
* [MacOS] Start on ListViewRenderer
* [MacOS] Cleanup
* [MacOS] Vertical center text on default NSTextField
* [MacOS] Center NSTextField vertically
* [MacOS] Add ImageCellRenderer
* [MacOS] Add SwitchCellRenderer
* [MacOS] Add SwitchCellRenderer
* [iOS] Allow to set background color on other CellRenderers
* [MacOS] Fix selection mode on ListView
* [MacOS] Set background on Entry of entry cell
* [MacOS] Fix casting bug on CellRenderer
* [MacOS] Other fix on CellRenderer background
* [MacOS] Add ViewCellRenderer
* [MacOS] Fixes and cleanup on cells
* [MacOS] Add NSScrollView so NSTableView can scroll
* [MacOS] Add HeaderView to ListView
* [MacOS] Cleanup
* [Controls] Add Header support to ListView
* [MacOS] NSView reuse on NSTableView
* [MacOS] Some fix on layour order
* [MacOS] Add CarouselPageRenderer
* [MacOS] Implement EventTracker on PageRenderer
* [MacOS] Cleanup CarouselPageRenderer
* [MacOS] Add MasterDetailPage renderer
* [MacOS] MDP renderer don't allow drag of splitter
* [MacOS] Add TabbedPage renderer
* [MacOS] Initial sketch of NavigationPageRenderer
* [MacOS] Send disappearing of CurrentPage on Dispose on NavigationPageRenderer
* [MacOS] Add Gallery page for Mac
* [MacOS] Add MacOSExpressionSearch
* [MacOS] Fix ColorExtension
* [MacOS] Fix MDP renderer layout
* [MacOS] Implement native selection on ListViewRenderer
* [MacOS] Deselect a item on NSTableView
* [MacOS] Remove previous SplitViewItems
* [MacOS] Fix navigationpage height
* [MacOS] Add toolbar for NavigationPageRenderer
* [MacOS] Don't remove selection for now (crashing)
* [MacOS] Refactor page and back button title on NavigationPageRenderer
* [MacOS] Fix bug when native navigate back
* [MacOS] Hide layer when transition
* [MacOS] ListviewRenderer fix BbackgroundColor
* [MacOS] Fix background on ScrollViewRenderer
* [MacOS] Fix header measure on ListViewRenderer
* [MacOS] Add Mac twitter demo
* [Controls] Spaces for easy reading
* [MacOS] More xaml cleanup
* [Core] Add Mac as aTargetPlatform
* [MacOS] Add alerts and actionsheets
* [MacOS] Add GestureRecognizers
* [MacOS] Fix Layout issues when adding children, enable transformations
* [MacOS] Fix title on tab item, move to tabbed navigation based on segmented control
* [MacOS] Hide toolbar when not needed, this allows to work with tabbed page, cleanup
* [MacOS] Add NativeBindings and NativeViewWrapper
* [MacOS] Fix AssemblyInfo
* [MacOS] FIX NRE on SetBackgroundColor BoxView
* [MacOS] Fix NavigationPageRenderer
* [MacOS] Fix build
* [MacOS] Also update page when it resizes
* [MacOS] Add LayoutRenderer for handle items position when the bounds change.
* [MacOS] Refactor/Cleanup
* [MacOS] Add toolbar items support to NavigationPage
* [MacOS] Resize images for TabViewITems
* [MacOS] Fix TabbedPage resize issues , allow users to override some features when creating TVI
* [MacOS] Fix hide/show Navigation toolbar
* [MacOS] Redo CarouselPageRenderer with NSPageController
* [MacOS] Add support for Modal pages
* [MacOS] Refactor navigation from platform
* [Nuget] Add nuget for MacOS
* [Nuget]Fix nuspec
* [Nuget] Add variables for CI
* [Controls] Remove MainMenu from MacOS
* [MacOS] Add TableView renderer (no headers yet)
* [MacOS] Refactoring, marking extensions as internal
* [MacOS] Add group headers for TableViewRenderer
* [MacOS] Workaround for updates on listview collection
* [MacOS] Handle updates of rows in the ListViewRenderer properly
* [MacOS] Fix navigation animation
* Fix navigation header issues with modal pages
* [MacOS] Fix MDP issues with resizing
* [MacOS] Fix general dispose
* [MacOS] Add a ViewControllerWrapper for NSSplitView
* [MacOS] MDP renderer fix animation
* [MacOS] Fix ListView selection bug
* [MacOS] Fix rendering MDP Layout inside wrappers
* [MacOS] Re write the MainToolbar handler
* [MacOS] Don't use Sierra new extensions so we can run in stable channel
* [MacOS] Another way to hide the toolbar (smarter i think)
* [MacOS] Fix MDP bug and remove debug color
* [Controls] Add HanselForms sample
* [MacOS] Fix NRE WebviewRenderer
* [MacOS] Fix uneven rows on ListView renderer
* [MacOS] Fix NRE on load (can+t find the reason this happens)
* [MacOS] Fix uneven rows
* [MacOS] Fix header sizing on ListViewRenderer
* [Controls] More stuff on HanselForms
* [MacOS] Remove warning from ListViewRenderer
* [MacOS] Fix PageRenderer bug double init
* [MacOS] Don't calculate height if RowHeight is provided
* [Controls] More Hanselforms stuff
* [MacOS] Once again a new implementation for the NavigationBar, this time using a custom view to support BackgroundColor
* [MacOS] Fix build
* [MacOS] Refactoring AwesomeBar related controls
* Fix build
* [MacOS] NavigationBar update background and t test colors
* [MacOS] Fix when we remove navigation so it works when the NavigationRenderer wasn't removed from the parent controller like in a TabbedPage
* [MacOS] Add support for ListView grouping
* [MacOS] Fix image extension method.
* [MacOS] Add base Maps project
* [MacOS] Export MapRenderer
* [MacOS] Add pin click and geocoderbacked for Maps
* [MacOS] Add extra binding project for API not in stable.
* [MacOS] Add MacOS Maps lib
* [MacOS]Fix build on alpha
* [MacOS] Remove MacOS Maps extra binding
* [UITest] Basic macOS setup
* [UITest] Add MacOSApp wrapper implementation
* [MacOS] Set AutomationID
* [UITests] Add ActionSheetUITests to MacOS UITest
* [MacOS] Fix bug on Picker
* [UITests] Link basic uitest basefixture and related files
* [MacOS] Fix pickers reuse
* [UItests] Fix MacOS app path
* [UITest] Ignore UItest for appearing on macOS for now
* [UITest] Update macOS for 2.0.3
* [UITest] Refactor EnterText MacOS app
* [UITest]Fix ViewQuery on MacOS
* [UITest]Fix IsEnabled UItest on macOS
* [UITest] Implement Enter, mark some tests inconclusive fix others
* [MacOS] Implement Entry Completed event
* [UITests] Fix UITest for IsVisible, ignore ToolbarItem test for now
* [UITests] Fix ISVisible again add extra category
* [Controls] Cleanup macOS gallery
* [MacOS] Fix Assembly info
* [Docs] Fix docs
* Fix build
* [Nuget] Fix nuspec
* [Controls] Link files on MacOS
* [Core] Update Forms stack before firing a event saying page was removed, possible breaking change
* [MacOS] Implement RemovePage on NavigationPAgeRenderer
* [UItest] Ignore some , implement back on MacOS UITest app
* [MacOS] Add default back button name (needs to be translated)
* [MacOS] Fix dispose
* [UITest] Make 29257 work on MacOS
* [MacOS] Rename stuff
* [MacOS] More renaming and cleanup
* [MacOS] Share implementations for iOS
* [MacOS] Reuse more IOS extensions
* [MacOS] Reuse FontExtensions
* [MacOS] Share NativeViewWrapper related stuff
* [MAcOS] Share event args and ExportRenderer
* [MacOS] Share platform effect
* [MacOS] Fix build
* [Docs]Fixing docs
* [MacOS] Fix ViewCell reuse
* [Core] Support ListView CachingStrategy on MacOS
* [MacOS] Fix issues with TextCell and ImageCell (we can’t set null to a NSControl value)
* [MacOS] Fix MDP child sizing bug
[UITest] Query marked by id and text
* [MacOS] Comment test related with context actions
* [MacOS] Implement missing stuff on ticker
* [MacOS] Make sure VisualElemenTracker calls the ticker update
* [UITests]Ignore context actions and not possible to test
* [MacOS] Fix Grouping bug on Listview
* [MacOS] Fix selection on Listview when using grouping
* [MacOS] Update navbar when page is popped
* [MacOS] Cleanup NavigationBar
* [Controls] More info on exceptions
* [MacOS] Fix bug animation pop modal
* [MacOS] Bring back BackgroundColor of NavigationBar
* [MacOS] Fix UITest animation delay
* [MacOS] Treat warnings as errors
* [MacOS] Center title on toolbar
* [Core] Add Platform configuration specific for MacOS
* [MacOS] Implement TabbedPage platform specific to handle TabItems on NavigationPage bar
* [MacOS] Fix warning
* [MacOS] Fix bug on SearchBar color
* [MacOS]Fix build
* [MacOS] remove extra dll from maps
* [Docs] Update docs
* [MacOS]Cleanup and refactoring
* Revert "[MacOS] remove extra dll from maps"
This reverts commit 73b948937001fea3f28449a963d0b94943e07aa0.
* [MacOS] Fix wrong refactoring
* [MacOS] Remove gallery and uitest project
* [MacOS] dix formatting
* [MacOS] Remove extra stuff
* Merge branch 'master' into macOS-gallery
* [MacOS] Fix rebase
* [MacOS] Fix TargetPlatform
* fix docs
* [MacOS] Fix bug on TabbedPageRenderer no title
* [MacOS] Remove FormsNSView
* [MacOS] Cleanup on dispose on MDP renderer
* [MacOS] Update current page when source changes
* [MacOS] More cleanup
* [MacOS] Make sure we show the previous page when popping a Modal
* [MacOS] Fix issue with sizing the Header and visibility, remove for now header renderer reuse
* [MacOS] Clean CustomNSTableView
* [MacOS] Share LabelRenderer with iOS
* [MacOS] Share ResourcesProvider with iOS
* [MAcoS] Share VisualElementPackager with iOS
* [MacOS] Share ViewRenderer with iOS
* [MacOS] Merge with VisualElementTracker from iOS
* [MacOS] Merge with EventTracker from iOS
* [MacOS] Merge with VisualElementRenderer of iOS
* [MacOS] Make sure we always have a layer
* [MacOS] Fix Tracker merge with iOS version
* [MacOS] Fix bug with tabbed page on modal without navigation
* [Core] Rever change on core
* [MacOS] Clear renderers before setting them MDP
* [MacOS] Update tabbedPage ContainerArea
* [MacOS] Fix ListViewRenderer
* [MacOS] Make sure we don’t pass null to TextField string value
* [MacOS] Support for multiple clicks in same selected item on NSTableView
* [MacOS] Support Focus on EntryRenderer
* [MacOS] Fix index bug on TablevIewDataSource
* [MacOS] Fix SelectedItem TableViewDataSource
* [Nuget] Add Mac to Maps nuspec
* [Nuget]Fix path
* [macOS] Fixed Tab NSImage crash in TabbedPageRenderer (#705)
* [macOS] Fixed Tab NSImage crash in TabbedPageRenderer
* Coding Style
* Coding Style
* [MacOS] Fix previous merge with master
* [MacOS] Possible simple fix for click on views overlapping
* [MacOS] Rename to IsOnViewCell
* [MacOS] Cleanup, Address feedback from Samantha’s review
Diffstat (limited to 'Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs')
-rw-r--r-- | Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs | 204 |
1 files changed, 204 insertions, 0 deletions
diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs new file mode 100644 index 00000000..8d2fd551 --- /dev/null +++ b/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs @@ -0,0 +1,204 @@ +using System; +using System.ComponentModel; +using System.Linq; +using AppKit; +using CoreGraphics; + +namespace Xamarin.Forms.Platform.MacOS +{ + public class MasterDetailPageRenderer : NSSplitViewController, IVisualElementRenderer, IEffectControlProvider + { + bool _disposed; + EventTracker _events; + VisualElementTracker _tracker; + MasterDetailPage _masterDetailPage; + + IPageController PageController => Element as IPageController; + + void IEffectControlProvider.RegisterEffect(Effect effect) + { + var platformEffect = effect as PlatformEffect; + if (platformEffect != null) + platformEffect.Container = View; + } + + protected MasterDetailPage MasterDetailPage => _masterDetailPage ?? (_masterDetailPage = (MasterDetailPage)Element); + + protected override void Dispose(bool disposing) + { + if (!_disposed && disposing) + { + PageController?.SendDisappearing(); + + if (Element != null) + { + Element.PropertyChanged -= HandlePropertyChanged; + Element = null; + } + + ClearControllers(); + + _tracker?.Dispose(); + _tracker = null; + _events?.Dispose(); + _events = null; + + _disposed = true; + } + base.Dispose(disposing); + } + + public NSViewController ViewController => this; + + public NSView NativeView => View; + + public VisualElement Element { get; private set; } + + public event EventHandler<VisualElementChangedEventArgs> ElementChanged; + + public SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint) + { + return NativeView.GetSizeRequest(widthConstraint, heightConstraint); + } + + public void SetElement(VisualElement element) + { + var oldElement = Element; + Element = element; + + UpdateControllers(); + + OnElementChanged(new VisualElementChangedEventArgs(oldElement, element)); + + EffectUtilities.RegisterEffectControlProvider(this, oldElement, element); + } + + public void SetElementSize(Size size) + { + Element.Layout(new Rectangle(Element.X, Element.Y, size.Width, size.Height)); + UpdateChildrenLayout(); + } + + protected virtual void OnElementChanged(VisualElementChangedEventArgs e) + { + if (e.OldElement != null) + e.OldElement.PropertyChanged -= HandlePropertyChanged; + + if (e.NewElement != null) + e.NewElement.PropertyChanged += HandlePropertyChanged; + + ElementChanged?.Invoke(this, e); + } + + protected virtual double MasterWidthPercentage => 0.3; + + public override void ViewWillAppear() + { + UpdateBackground(); + _tracker = new VisualElementTracker(this); + _events = new EventTracker(this); + _events.LoadEvents(NativeView); + UpdateChildrenLayout(); + + base.ViewWillAppear(); + } + + public override CGRect GetEffectiveRect(NSSplitView splitView, CGRect proposedEffectiveRect, CGRect drawnRect, + nint dividerIndex) + { + return CGRect.Empty; + } + + void UpdateChildrenLayout() + { + if (View.Frame.Width == -1) + return; + var width = View.Frame.Width; + var masterWidth = MasterWidthPercentage * width; + if (SplitViewItems.Length > 0) + SplitViewItems[0].MaximumThickness = SplitViewItems[0].MinimumThickness = (nfloat)masterWidth; + } + + void HandlePropertyChanged(object sender, PropertyChangedEventArgs e) + { + if (_tracker == null) + return; + + if (e.PropertyName == "Master" || e.PropertyName == "Detail") + UpdateControllers(); + } + + void UpdateControllers() + { + ClearControllers(); + + if (Platform.GetRenderer(MasterDetailPage.Master) == null) + Platform.SetRenderer(MasterDetailPage.Master, Platform.CreateRenderer(MasterDetailPage.Master)); + if (Platform.GetRenderer(MasterDetailPage.Detail) == null) + Platform.SetRenderer(MasterDetailPage.Detail, Platform.CreateRenderer(MasterDetailPage.Detail)); + + AddSplitViewItem(new NSSplitViewItem + { + ViewController = new ViewControllerWrapper(Platform.GetRenderer(MasterDetailPage.Master)) + }); + AddSplitViewItem(new NSSplitViewItem + { + ViewController = new ViewControllerWrapper(Platform.GetRenderer(MasterDetailPage.Detail)) + }); + + UpdateChildrenLayout(); + } + + void ClearControllers() + { + while (SplitViewItems.Length > 0) + { + var splitItem = SplitViewItems.Last(); + var childVisualRenderer = splitItem.ViewController as ViewControllerWrapper; + RemoveSplitViewItem(splitItem); + IVisualElementRenderer render = null; + if (childVisualRenderer.RendererWeakRef.TryGetTarget(out render)) + { + render.Dispose(); + } + childVisualRenderer.Dispose(); + childVisualRenderer = null; + } + } + + //TODO: Implement Background color on MDP + void UpdateBackground() + { + } + + sealed class ViewControllerWrapper : NSViewController + { + internal WeakReference<IVisualElementRenderer> RendererWeakRef; + + public ViewControllerWrapper(IVisualElementRenderer renderer) + { + RendererWeakRef = new WeakReference<IVisualElementRenderer>(renderer); + View = new NSView { WantsLayer = true }; + AddChildViewController(renderer.ViewController); + View.AddSubview(renderer.NativeView); + } + + public override void ViewWillLayout() + { + IVisualElementRenderer renderer; + if (RendererWeakRef.TryGetTarget(out renderer)) + renderer?.Element?.Layout(new Rectangle(0, 0, View.Bounds.Width, View.Bounds.Height)); + base.ViewWillLayout(); + } + + protected override void Dispose(bool disposing) + { + if (disposing && RendererWeakRef != null) + { + RendererWeakRef = null; + } + base.Dispose(disposing); + } + } + } +}
\ No newline at end of file |