From: Umar Date: Tue, 2 May 2017 18:02:30 +0000 (+0100) Subject: Separate C# classes into Internal and Public X-Git-Tag: dali_1.2.40~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=318378db7fbb0bcfb08c3c603f54857d6f5c9639;ds=sidebyside Separate C# classes into Internal and Public Change-Id: I12b90fc0eb411d0d4df9dcbf6d79e70a46cc4fb8 --- diff --git a/plugins/dali-sharp/examples/control-dashboard.cs b/plugins/dali-sharp/examples/control-dashboard.cs index abe7efa..e922efe 100755 --- a/plugins/dali-sharp/examples/control-dashboard.cs +++ b/plugins/dali-sharp/examples/control-dashboard.cs @@ -67,9 +67,9 @@ namespace MyCSharpExample // Top label TextLabel topLabel = new TextLabel(); - topLabel.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - topLabel.SetResizePolicy(ResizePolicyType.SIZE_RELATIVE_TO_PARENT, DimensionType.HEIGHT); - topLabel.AnchorPoint = NDalic.AnchorPointTopCenter; + topLabel.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + topLabel.SetResizePolicy(ResizePolicyType.SIZE_RELATIVE_TO_PARENT, DimensionType.Height); + topLabel.PivotPoint = NDalic.AnchorPointTopCenter; topLabel.Position = new Position(0, 0, 0); topLabel.SetSizeModeFactor(new Vector3(0.0f, 0.1f, 0.0f)); topLabel.BackgroundColor = new Color(43.0f / 255.0f, 145.0f / 255.0f, 175.0f / 255.0f, 1.0f); @@ -82,10 +82,10 @@ namespace MyCSharpExample // Grid container to contain items. Use tableView because FlexContainer support focus navigation just two direction ( up/down or left/right ) _contentContainer = new TableView(6, 5); - _contentContainer.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - _contentContainer.SetResizePolicy(ResizePolicyType.SIZE_RELATIVE_TO_PARENT, DimensionType.HEIGHT); + _contentContainer.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + _contentContainer.SetResizePolicy(ResizePolicyType.SIZE_RELATIVE_TO_PARENT, DimensionType.Height); _contentContainer.SetSizeModeFactor(new Vector3(0.0f, 0.9f, 0.0f)); - _contentContainer.AnchorPoint = NDalic.AnchorPointBottomCenter; + _contentContainer.PivotPoint = NDalic.AnchorPointBottomCenter; _contentContainer.Position = new Position(0, _window.Size.Height * 0.1f, 0); _contentContainer.SetRelativeHeight(0, 0.07f); _contentContainer.SetRelativeHeight(1, 0.26f); @@ -93,7 +93,7 @@ namespace MyCSharpExample _contentContainer.SetRelativeHeight(3, 0.26f); _contentContainer.SetRelativeHeight(4, 0.07f); _contentContainer.SetRelativeHeight(5, 0.26f); - _contentContainer.SetKeyboardFocusable(true); + _contentContainer.SetFocusable(true); _window.Add(_contentContainer); CreateContent(); @@ -101,7 +101,7 @@ namespace MyCSharpExample FocusManager.Instance.PreFocusChange += OnPreFocusChange; } - // Callback for KeyboardFocusManager + // Callback for FocusManager private View OnPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) { if (!e.Proposed && !e.Current) @@ -136,8 +136,8 @@ namespace MyCSharpExample { PushButton pushButton = new PushButton(); pushButton.LabelText = "Push Button"; - pushButton.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - pushButton.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT); + pushButton.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + pushButton.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Height); pushButton.UnselectedColor = new Vector4(1.0f, 0.0f, 0.0f, 1.0f); pushButton.SelectedColor = new Vector4(0.0f, 1.0f, 0.0f, 1.0f); pushButton.Clicked += (obj, e) => @@ -193,8 +193,8 @@ namespace MyCSharpExample if (item.name.CompareTo("ProgressBar") == 0) { _progressBar = new ProgressBar(); - _progressBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - _progressBar.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.HEIGHT); + _progressBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + _progressBar.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.Height); _progressBar.SetSize(0, 50); _progressBar.ValueChanged += OnProgressBarValueChanged; @@ -234,8 +234,8 @@ namespace MyCSharpExample if (item.name.CompareTo("RadioButton") == 0) { TableView tableView = new TableView(2, 1); - tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT); + tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Height); RadioButton rButton = new RadioButton(); rButton.LabelText = "Yes"; @@ -253,8 +253,8 @@ namespace MyCSharpExample if (item.name.CompareTo("Tooltip") == 0) { TableView tableView = new TableView(2, 1); - tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT); + tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + tableView.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Height); // Create two push buttons and add them to a table view PushButton buttonWithSimpleTooltip = new PushButton(); @@ -302,7 +302,7 @@ namespace MyCSharpExample PushButton button = new PushButton(); button.LabelText = "Popup"; button.ParentOrigin = NDalic.ParentOriginCenter; - button.AnchorPoint = NDalic.AnchorPointCenter; + button.PivotPoint = NDalic.AnchorPointCenter; button.MaximumSize = new Vector2(90.0f, 50.0f); _popup = CreatePopup(); _popup.SetTitle(CreateTitle("Popup")); @@ -310,11 +310,11 @@ namespace MyCSharpExample TextLabel text = new TextLabel("This will erase the file permanently. Are you sure?"); text.BackgroundColor = Color.White; text.MultiLine = true; - text.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - text.SetResizePolicy(ResizePolicyType.DIMENSION_DEPENDENCY, DimensionType.HEIGHT); + text.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + text.SetResizePolicy(ResizePolicyType.DIMENSION_DEPENDENCY, DimensionType.Height); text.SetPadding(new PaddingType(10.0f, 10.0f, 20.0f, 0.0f)); _popup.SetContent(text); - _popup.SetKeyboardFocusable(true); + _popup.SetFocusable(true); _popup.SetDisplayState(Popup.DisplayStateType.HIDDEN); button.Clicked += (obj, ee) => @@ -331,7 +331,7 @@ namespace MyCSharpExample PushButton button = new PushButton(); button.LabelText = "Toast"; button.ParentOrigin = NDalic.ParentOriginCenter; - button.AnchorPoint = NDalic.AnchorPointCenter; + button.PivotPoint = NDalic.AnchorPointCenter; button.Clicked += (obj, ee) => { TypeInfo typeInfo = new TypeInfo(TypeRegistry.Get().GetTypeInfo("PopupToast")); @@ -363,7 +363,7 @@ namespace MyCSharpExample { ImageView notSupportView = new ImageView("images/not_yet_sign.png"); notSupportView.Size = new Vector3(_window.GetSize().Width * 0.2f, _window.GetSize().Height * 0.25f, 0.0f); - notSupportView.SetKeyboardFocusable(true); + notSupportView.SetFocusable(true); _contentContainer.AddChild(notSupportView, new TableView.CellPosition(((uint)idx / 5) * 2 + 1, (uint)idx % 5)); } @@ -373,36 +373,36 @@ namespace MyCSharpExample Popup confirmationPopup = new Popup(); View footer = new View(); - footer.SetName("Footer"); - footer.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.WIDTH); - footer.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.HEIGHT); + footer.Name = "Footer"; + footer.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Width); + footer.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.Height); footer.SetSize(0.0f, 80.0f); footer.ParentOrigin = NDalic.ParentOriginCenter; - footer.AnchorPoint = NDalic.AnchorPointCenter; + footer.PivotPoint = NDalic.AnchorPointCenter; PushButton okButton = CreateOKButton(); okButton.ParentOrigin = NDalic.ParentOriginCenter; - okButton.AnchorPoint = NDalic.AnchorPointCenter; - okButton.SetResizePolicy(ResizePolicyType.SIZE_FIXED_OFFSET_FROM_PARENT, DimensionType.ALL_DIMENSIONS); + okButton.PivotPoint = NDalic.AnchorPointCenter; + okButton.SetResizePolicy(ResizePolicyType.SIZE_FIXED_OFFSET_FROM_PARENT, DimensionType.AllDimensions); okButton.SetSizeModeFactor(new Vector3(-20.0f, -20.0f, 0.0f)); PushButton cancelButton = CreateCancelButton(); cancelButton.ParentOrigin = NDalic.ParentOriginCenter; - cancelButton.AnchorPoint = NDalic.AnchorPointCenter; - cancelButton.SetResizePolicy(ResizePolicyType.SIZE_FIXED_OFFSET_FROM_PARENT, DimensionType.ALL_DIMENSIONS); + cancelButton.PivotPoint = NDalic.AnchorPointCenter; + cancelButton.SetResizePolicy(ResizePolicyType.SIZE_FIXED_OFFSET_FROM_PARENT, DimensionType.AllDimensions); cancelButton.SetSizeModeFactor(new Vector3(-20.0f, -20.0f, 0.0f)); TableView controlLayout = new TableView(1, 2); controlLayout.ParentOrigin = NDalic.ParentOriginCenter; - controlLayout.AnchorPoint = NDalic.AnchorPointCenter; - controlLayout.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS); + controlLayout.PivotPoint = NDalic.AnchorPointCenter; + controlLayout.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.AllDimensions); controlLayout.SetCellPadding(new Size2D(10, 10)); controlLayout.SetRelativeWidth(0, 0.5f); controlLayout.SetRelativeWidth(1, 0.5f); - controlLayout.SetCellAlignment(new TableView.CellPosition(0, 0), HorizontalAlignmentType.CENTER, VerticalAlignmentType.CENTER); - controlLayout.SetCellAlignment(new TableView.CellPosition(0, 1), HorizontalAlignmentType.CENTER, VerticalAlignmentType.CENTER); + controlLayout.SetCellAlignment(new TableView.CellPosition(0, 0), HorizontalAlignmentType.Center, VerticalAlignmentType.CENTER); + controlLayout.SetCellAlignment(new TableView.CellPosition(0, 1), HorizontalAlignmentType.Center, VerticalAlignmentType.CENTER); controlLayout.AddChild(okButton, new TableView.CellPosition(0, 0)); controlLayout.AddChild(cancelButton, new TableView.CellPosition(0, 1)); @@ -425,9 +425,9 @@ namespace MyCSharpExample PushButton CreateOKButton() { PushButton okayButton = new PushButton(); - okayButton.SetName("OKButton"); + okayButton.Name = "OKButton"; okayButton.LabelText = "OK"; - okayButton.SetKeyboardFocusable(true); + okayButton.SetFocusable(true); okayButton.Clicked += (obj, ee) => { _popup.SetDisplayState(Popup.DisplayStateType.HIDDEN); @@ -439,7 +439,7 @@ namespace MyCSharpExample { PushButton cancelButton = new PushButton(); cancelButton.LabelText = "Cancel"; - cancelButton.SetKeyboardFocusable(true); + cancelButton.SetFocusable(true); cancelButton.Clicked += (obj, ee) => { _popup.SetDisplayState(Popup.DisplayStateType.HIDDEN); diff --git a/plugins/dali-sharp/examples/date-picker-using-json.cs b/plugins/dali-sharp/examples/date-picker-using-json.cs index ade1b72..272633f 100644 --- a/plugins/dali-sharp/examples/date-picker-using-json.cs +++ b/plugins/dali-sharp/examples/date-picker-using-json.cs @@ -75,17 +75,17 @@ namespace MyCSharpExample _spinMonth.Value = 5; _spinDay.Value = 23; - _spinYear.SetKeyboardFocusable(true); - _spinMonth.SetKeyboardFocusable(true); - _spinDay.SetKeyboardFocusable(true); + _spinYear.SetFocusable(true); + _spinMonth.SetFocusable(true); + _spinDay.SetFocusable(true); - FocusManager keyboardFocusManager = FocusManager.Instance; - keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange; - keyboardFocusManager.FocusedActorEnterKeyPressed += OnFocusedActorEnterKeyPressed; + FocusManager FocusManager = FocusManager.Instance; + FocusManager.PreFocusChange += OnPreFocusChange; + FocusManager.FocusedActorEnterKeyPressed += OnFocusedActorEnterKeyPressed; } - private Actor OnKeyboardPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) + private Actor OnPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) { Actor nextFocusActor = e.Proposed; @@ -94,7 +94,7 @@ namespace MyCSharpExample { nextFocusActor = _spinYear.SpinText; } - else if(e.Direction == View.KeyboardFocus.Direction.LEFT) + else if(e.Direction == View.Focus.Direction.LEFT) { // Move the focus to the spin in the left of the current focused spin if(e.Current == _spinMonth.SpinText) @@ -106,7 +106,7 @@ namespace MyCSharpExample nextFocusActor = _spinMonth.SpinText; } } - else if(e.Direction == View.KeyboardFocus.Direction.RIGHT) + else if(e.Direction == View.Focus.Direction.RIGHT) { // Move the focus to the spin in the right of the current focused spin if(e.Current == _spinYear.SpinText) diff --git a/plugins/dali-sharp/examples/date-picker.cs b/plugins/dali-sharp/examples/date-picker.cs index a973f8d..ef13fa7 100644 --- a/plugins/dali-sharp/examples/date-picker.cs +++ b/plugins/dali-sharp/examples/date-picker.cs @@ -68,7 +68,7 @@ namespace MyCSharpExample _spinYear.MaxTextLength = 4; _spinYear.TextPointSize = 26; _spinYear.TextColor = Color.White; - _spinYear.SetKeyboardFocusable(true); + _spinYear.SetFocusable(true); _spinYear.Name = "_spinYear"; // Create a Spin control for month @@ -86,7 +86,7 @@ namespace MyCSharpExample _spinMonth.MaxTextLength = 2; _spinMonth.TextPointSize = 26; _spinMonth.TextColor = Color.White; - _spinMonth.SetKeyboardFocusable(true); + _spinMonth.SetFocusable(true); _spinMonth.Name = "_spinMonth"; // Create a Spin control for day @@ -107,13 +107,13 @@ namespace MyCSharpExample _spinDay.SetKeyboardFocusable(true); _spinDay.Name = "_spinDay"; - FocusManager keyboardFocusManager = FocusManager.Instance; - keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange; - keyboardFocusManager.FocusedActorEnterKeyPressed += OnFocusedActorEnterKeyPressed; + FocusManager FocusManager = FocusManager.Instance; + FocusManager.PreFocusChange += OnPreFocusChange; + FocusManager.FocusedActorEnterKeyPressed += OnFocusedActorEnterKeyPressed; } - private Actor OnKeyboardPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) + private Actor OnPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) { Actor nextFocusActor = e.Proposed; @@ -122,7 +122,7 @@ namespace MyCSharpExample { nextFocusActor = _spinYear.SpinText; } - else if(e.Direction == View.KeyboardFocus.Direction.LEFT) + else if(e.Direction == View.Focus.Direction.LEFT) { // Move the focus to the spin in the left of the current focused spin if(e.Current == _spinMonth.SpinText) @@ -134,7 +134,7 @@ namespace MyCSharpExample nextFocusActor = _spinMonth.SpinText; } } - else if(e.Direction == View.KeyboardFocus.Direction.RIGHT) + else if(e.Direction == View.Focus.Direction.RIGHT) { // Move the focus to the spin in the right of the current focused spin if(e.Current == _spinYear.SpinText) diff --git a/plugins/dali-sharp/examples/hello-world.cs b/plugins/dali-sharp/examples/hello-world.cs index 4f2667c..3fe2192 100755 --- a/plugins/dali-sharp/examples/hello-world.cs +++ b/plugins/dali-sharp/examples/hello-world.cs @@ -40,12 +40,12 @@ namespace MyCSharpExample Console.WriteLine("Customized Application Initialize event handler"); _window = Window.Instance; _window.BackgroundColor = Color.White; - _window.Touch += OnWindowTouched; + _window.Touched += OnWindowTouched; // Add a _text label to the stage _text = new TextLabel("Hello Mono World"); _text.ParentOrigin = ParentOrigin.Center; - _text.AnchorPoint = AnchorPoint.Center; + _text.PivotPoint = AnchorPoint.Center; _text.HorizontalAlignment = "CENTER"; _text.PointSize = 32.0f; _text.TextColor = Color.Magenta; diff --git a/plugins/dali-sharp/examples/image-view.cs b/plugins/dali-sharp/examples/image-view.cs index 85c568d..ba4eb06 100755 --- a/plugins/dali-sharp/examples/image-view.cs +++ b/plugins/dali-sharp/examples/image-view.cs @@ -48,8 +48,8 @@ namespace ImageViewExample Log("Customized Application Initialize event handler"); window = Window.Instance; window.BackgroundColor = Color.Cyan; - window.Touch += OnWindowTouched; - window.Wheel += OnWindowWheelMoved; + window.Touched += OnWindowTouched; + window.WheelRolled += OnWindowWheelMoved; window.Key += OnWindowKeyPressed; //window.EventProcessingFinished += OnWindowEventProcessingFinished; @@ -68,14 +68,14 @@ namespace ImageViewExample _imageView = new ImageView(); _imageView.ResourceUrl = "./images/gallery-3.jpg"; _imageView.ParentOrigin = ParentOrigin.Center; - _imageView.AnchorPoint = AnchorPoint.Center; + _imageView.PivotPoint = AnchorPoint.Center; _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f); //_imageView.SetResizePolicy(ResizePolicyType.USE_NATURAL_SIZE, DimensionType.ALL_DIMENSIONS); layer.Add(_imageView); _pushButton1 = new PushButton(); _pushButton1.ParentOrigin = ParentOrigin.BottomLeft; - _pushButton1.AnchorPoint = AnchorPoint.BottomLeft; + _pushButton1.PivotPoint = AnchorPoint.BottomLeft; _pushButton1.LabelText = "start animation"; _pushButton1.Position = new Vector3(0.0f, window.Size.Height * 0.1f, 0.0f); _pushButton1.Clicked += OnPushButtonClicked1; @@ -83,7 +83,7 @@ namespace ImageViewExample _pushButton2 = new PushButton(); _pushButton2.ParentOrigin = ParentOrigin.BottomLeft; - _pushButton2.AnchorPoint = AnchorPoint.BottomLeft; + _pushButton2.PivotPoint = AnchorPoint.BottomLeft; _pushButton2.LabelText = "reload image with same URL"; _pushButton2.Position = new Vector3(0.0f, window.Size.Height * 0.2f, 0.0f); _pushButton2.Clicked += OnPushButtonClicked2; @@ -100,7 +100,7 @@ namespace ImageViewExample _imageView = new ImageView(); _imageView.ResourceUrl = "./images/gallery-3.jpg"; _imageView.ParentOrigin = ParentOrigin.Center; - _imageView.AnchorPoint = AnchorPoint.Center; + _imageView.PivotPoint = AnchorPoint.Center; _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f); //_imageView.SetResizePolicy(ResizePolicyType.USE_NATURAL_SIZE, DimensionType.ALL_DIMENSIONS); layer.Add(_imageView); diff --git a/plugins/dali-sharp/examples/scroll-view.cs b/plugins/dali-sharp/examples/scroll-view.cs index af93924..9c199d2 100755 --- a/plugins/dali-sharp/examples/scroll-view.cs +++ b/plugins/dali-sharp/examples/scroll-view.cs @@ -50,7 +50,7 @@ namespace MyCSharpExample Size2D windowSize = window.Size; _scrollView.Size = new Position(windowSize.Width, windowSize.Height, 0.0f); _scrollView.ParentOrigin = NDalic.ParentOriginCenter; - _scrollView.AnchorPoint = NDalic.AnchorPointCenter; + _scrollView.PivotPoint = NDalic.AnchorPointCenter; window.Add(_scrollView); // Add actors to a scroll view with 3 pages @@ -61,9 +61,9 @@ namespace MyCSharpExample for (int pageColumn = 0; pageColumn < pageColumns; pageColumn++) { View pageActor = new View(); - pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS); + pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.AllDimensions); pageActor.ParentOrigin = NDalic.ParentOriginCenter; - pageActor.AnchorPoint = NDalic.AnchorPointCenter; + pageActor.PivotPoint = NDalic.AnchorPointCenter; pageActor.Position = new Position(pageColumn * windowSize.Width, pageRow * windowSize.Height, 0.0f); // Add images in a 3x4 grid layout for each page @@ -79,7 +79,7 @@ namespace MyCSharpExample int imageId = (row * imageColumns + column) % 2 + 1; ImageView imageView = new ImageView("images/image-" + imageId + ".jpg"); imageView.ParentOrigin = NDalic.ParentOriginCenter; - imageView.AnchorPoint = NDalic.AnchorPointCenter; + imageView.PivotPoint = NDalic.AnchorPointCenter; imageView.Size = imageSize; imageView.Position = new Position(margin * 0.5f + (imageSize.X + margin) * column - windowSize.Width * 0.5f + imageSize.X * 0.5f, margin * 0.5f + (imageSize.Y + margin) * row - windowSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f); @@ -105,20 +105,20 @@ namespace MyCSharpExample // Create a horizontal scroll bar in the bottom of scroll view (which is optional) _scrollBar = new ScrollBar(); _scrollBar.ParentOrigin = NDalic.ParentOriginBottomLeft; - _scrollBar.AnchorPoint = NDalic.AnchorPointTopLeft; - _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.WIDTH); - _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT); + _scrollBar.PivotPoint = NDalic.AnchorPointTopLeft; + _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.Width); + _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Height); _scrollBar.Orientation = new Rotation(new Radian(new Degree(270.0f)), Vector3.ZAXIS); _scrollBar.SetScrollDirection(ScrollBar.Direction.Horizontal); _scrollView.Add(_scrollBar); // Connect to the OnRelayout signal - _scrollView.OnRelayoutEvent += OnScrollViewRelayout; + _scrollView.Relayout += OnScrollViewRelayout; _scrollView.Touched += OnTouch; - _scrollView.WheelMoved += Onwheel; - _scrollView.KeyInputFocusGained += OnKey; + _scrollView.WheelRolled += Onwheel; + _scrollView.FocusGained += OnKey; _text = new TextLabel("View Touch Event Handler Test"); - _text.AnchorPoint = NDalic.AnchorPointTopLeft; + _text.PivotPoint = NDalic.AnchorPointTopLeft; _text.HorizontalAlignment = "CENTER"; _text.PointSize = 48.0f; @@ -175,7 +175,7 @@ namespace MyCSharpExample Console.WriteLine("View OnRelayoutEventArgs EVENT callback...."); // Set the correct scroll bar size after size negotiation of scroll view is done - _scrollBar.Size = new Position(0.0f, _scrollView.GetRelayoutSize(DimensionType.WIDTH), 0.0f); + _scrollBar.Size = new Position(0.0f, _scrollView.GetRelayoutSize(DimensionType.Width), 0.0f); } public void MainLoop() diff --git a/plugins/dali-sharp/examples/user-alphafunction.cs b/plugins/dali-sharp/examples/user-alphafunction.cs index a55fd4a..28806d5 100755 --- a/plugins/dali-sharp/examples/user-alphafunction.cs +++ b/plugins/dali-sharp/examples/user-alphafunction.cs @@ -50,14 +50,14 @@ namespace MyCSharpExample Log("Initialize() is called!"); Window window = Window.Instance; window.BackgroundColor = Color.White; - window.Touch += OnWindowTouched; - window.Touch += OnWindowTouched2; - window.Wheel += OnWindowWheelEvent; + window.Touched += OnWindowTouched; + window.Touched += OnWindowTouched2; + window.WheelRolled += OnWindowWheelEvent; // Add a _text label to the window _text = new TextLabel("Hello Mono World"); _text.ParentOrigin = ParentOrigin.BottomCenter; - _text.AnchorPoint = AnchorPoint.BottomCenter; + _text.PivotPoint = AnchorPoint.BottomCenter; _text.HorizontalAlignment = "CENTER"; _text.PointSize = 32.0f; window.Add(_text); @@ -66,25 +66,25 @@ namespace MyCSharpExample _view1.Size = new Vector3(200.0f, 200.0f, 0.0f); _view1.BackgroundColor = Color.Green; _view1.ParentOrigin = ParentOrigin.Center; - _view1.AnchorPoint = AnchorPoint.Center; - _view1.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.ALL_DIMENSIONS); - _view1.OnWindowEvent += OnWindow; + _view1.PivotPoint = AnchorPoint.Center; + _view1.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.AllDimensions); + _view1.AddedToWindow += OnWindow; window.Add(_view1); _view2 = new View(); _view2.BackgroundColor = Color.Red; _view2.Size = new Vector3(50.0f, 50.0f, 0.0f); _view2.ParentOrigin = ParentOrigin.TopLeft; - _view2.AnchorPoint = AnchorPoint.TopLeft; - _view2.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.ALL_DIMENSIONS); + _view2.PivotPoint = AnchorPoint.TopLeft; + _view2.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.AllDimensions); _view1.Add(_view2); _view3 = new View(); _view3.BackgroundColor = Color.Blue; _view3.Size = new Vector3(50.0f, 50.0f, 0.0f); _view3.ParentOrigin = ParentOrigin.TopLeft; - _view3.AnchorPoint = AnchorPoint.TopLeft; - _view3.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.ALL_DIMENSIONS); + _view3.PivotPoint = AnchorPoint.TopLeft; + _view3.SetResizePolicy(ResizePolicyType.FIXED, DimensionType.AllDimensions); _view1.Add(_view3); _user_alpha_func = new UserAlphaFunctionDelegate(body); diff --git a/plugins/dali-sharp/examples/visuals-example.cs b/plugins/dali-sharp/examples/visuals-example.cs index f3b21ea..7bdb14b 100755 --- a/plugins/dali-sharp/examples/visuals-example.cs +++ b/plugins/dali-sharp/examples/visuals-example.cs @@ -74,7 +74,7 @@ namespace MyCSharpExample imageVisual.Add( Visual.Property.Type, new Property.Value( (int)Visual.Type.Image )) .Add( ImageVisualProperty.URL, new Property.Value( "./images/gallery-0.jpg" )); imageView.Background = imageVisual; - contentLayout.SetCellAlignment(new TableView.CellPosition(2, 0), HorizontalAlignmentType.CENTER, VerticalAlignmentType.CENTER); + contentLayout.SetCellAlignment(new TableView.CellPosition(2, 0), HorizontalAlignmentType.Center, VerticalAlignmentType.CENTER); contentLayout.Add(imageView); // Primitive Visual example diff --git a/plugins/dali-sharp/examples/visuals-using-custom-view/ContactView.cs b/plugins/dali-sharp/examples/visuals-using-custom-view/ContactView.cs index ad9bc2d..e8a7d1c 100644 --- a/plugins/dali-sharp/examples/visuals-using-custom-view/ContactView.cs +++ b/plugins/dali-sharp/examples/visuals-using-custom-view/ContactView.cs @@ -40,7 +40,7 @@ namespace VisualsUsingCustomView private string _name; private Color _color; - public ContactView() : base(typeof(ContactView).Name, ViewWrapperImpl.CustomViewBehaviour.REQUIRES_KEYBOARD_NAVIGATION_SUPPORT) + public ContactView() : base(typeof(ContactView).Name, CustomViewBehaviour.REQUIRES_KEYBOARD_NAVIGATION_SUPPORT) { } diff --git a/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs b/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs index 68cfaa8..ad3cf9c 100644 --- a/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs +++ b/plugins/dali-sharp/sharp/internal/AccessibilityActionSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class AccessibilityActionSignal : global::System.IDisposable { +internal class AccessibilityActionSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs b/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs index a038c90..82594a1 100644 --- a/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs +++ b/plugins/dali-sharp/sharp/internal/AccessibilityFocusOvershotSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class AccessibilityFocusOvershotSignal : global::System.IDisposable { +internal class AccessibilityFocusOvershotSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs b/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs index a0613a2..3003e48 100644 --- a/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs +++ b/plugins/dali-sharp/sharp/internal/AccessibilityManager.cs @@ -13,7 +13,7 @@ namespace Dali { using System; using System.Runtime.InteropServices; -public class AccessibilityManager : BaseHandle { +internal class AccessibilityManager : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal AccessibilityManager(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.AccessibilityManager_SWIGUpcast(cPtr), cMemoryOwn) { @@ -2467,157 +2467,157 @@ public class AccessibilityManager : BaseHandle { return ret; } - public AccessibilityActionSignal StatusChangedSignal() { + internal AccessibilityActionSignal StatusChangedSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_StatusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionNextSignal() { + internal AccessibilityActionSignal ActionNextSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionNextSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionPreviousSignal() { + internal AccessibilityActionSignal ActionPreviousSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionPreviousSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionActivateSignal() { + internal AccessibilityActionSignal ActionActivateSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionActivateSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadSignal() { + internal AccessibilityActionSignal ActionReadSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionOverSignal() { + internal AccessibilityActionSignal ActionOverSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionOverSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadNextSignal() { + internal AccessibilityActionSignal ActionReadNextSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadNextSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadPreviousSignal() { + internal AccessibilityActionSignal ActionReadPreviousSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadPreviousSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionUpSignal() { + internal AccessibilityActionSignal ActionUpSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionUpSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionDownSignal() { + internal AccessibilityActionSignal ActionDownSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionDownSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionClearFocusSignal() { + internal AccessibilityActionSignal ActionClearFocusSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionClearFocusSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionBackSignal() { + internal AccessibilityActionSignal ActionBackSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionBackSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionScrollUpSignal() { + internal AccessibilityActionSignal ActionScrollUpSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionScrollUpSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionScrollDownSignal() { + internal AccessibilityActionSignal ActionScrollDownSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionScrollDownSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionPageLeftSignal() { + internal AccessibilityActionSignal ActionPageLeftSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionPageLeftSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionPageRightSignal() { + internal AccessibilityActionSignal ActionPageRightSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionPageRightSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionPageUpSignal() { + internal AccessibilityActionSignal ActionPageUpSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionPageUpSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionPageDownSignal() { + internal AccessibilityActionSignal ActionPageDownSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionPageDownSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionMoveToFirstSignal() { + internal AccessibilityActionSignal ActionMoveToFirstSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionMoveToFirstSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionMoveToLastSignal() { + internal AccessibilityActionSignal ActionMoveToLastSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionMoveToLastSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadFromTopSignal() { + internal AccessibilityActionSignal ActionReadFromTopSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadFromTopSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadFromNextSignal() { + internal AccessibilityActionSignal ActionReadFromNextSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadFromNextSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionZoomSignal() { + internal AccessibilityActionSignal ActionZoomSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionZoomSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadIndicatorInformationSignal() { + internal AccessibilityActionSignal ActionReadIndicatorInformationSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadIndicatorInformationSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionReadPauseResumeSignal() { + internal AccessibilityActionSignal ActionReadPauseResumeSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionReadPauseResumeSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public AccessibilityActionSignal ActionStartStopSignal() { + internal AccessibilityActionSignal ActionStartStopSignal() { AccessibilityActionSignal ret = new AccessibilityActionSignal(NDalicPINVOKE.AccessibilityManager_ActionStartStopSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/AngleThresholdPair.cs b/plugins/dali-sharp/sharp/internal/AngleThresholdPair.cs index 8cce262..639f005 100644 --- a/plugins/dali-sharp/sharp/internal/AngleThresholdPair.cs +++ b/plugins/dali-sharp/sharp/internal/AngleThresholdPair.cs @@ -10,7 +10,7 @@ namespace Dali { -public class AngleThresholdPair : global::System.IDisposable { +internal class AngleThresholdPair : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs b/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs index 7c328f0..05fba79 100644 --- a/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/AnimatablePropertyComponentRegistration.cs @@ -10,7 +10,7 @@ namespace Dali { -public class AnimatablePropertyComponentRegistration : global::System.IDisposable { +internal class AnimatablePropertyComponentRegistration : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs b/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs index f617343..9b6552d 100644 --- a/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/AnimatablePropertyRegistration.cs @@ -10,7 +10,7 @@ namespace Dali { -public class AnimatablePropertyRegistration : global::System.IDisposable { +internal class AnimatablePropertyRegistration : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/AnimationSignal.cs b/plugins/dali-sharp/sharp/internal/AnimationSignal.cs index c558d96..a1f87c0 100644 --- a/plugins/dali-sharp/sharp/internal/AnimationSignal.cs +++ b/plugins/dali-sharp/sharp/internal/AnimationSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class AnimationSignal : global::System.IDisposable { +internal class AnimationSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Any.cs b/plugins/dali-sharp/sharp/internal/Any.cs index 99207f0..6394511 100644 --- a/plugins/dali-sharp/sharp/internal/Any.cs +++ b/plugins/dali-sharp/sharp/internal/Any.cs @@ -10,7 +10,7 @@ namespace Dali { -public class Any : global::System.IDisposable { +internal class Any : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs b/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs index bc88f61..7bf0d46 100644 --- a/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ApplicationControlSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ApplicationControlSignal : global::System.IDisposable { +internal class ApplicationControlSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs b/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs index 22dd82a..0c42ae8 100644 --- a/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs +++ b/plugins/dali-sharp/sharp/internal/ApplicationExtensions.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ApplicationExtensions : global::System.IDisposable { +internal class ApplicationExtensions : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs b/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs index 17d0925..75119c8 100644 --- a/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ApplicationSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ApplicationSignal : global::System.IDisposable { +internal class ApplicationSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs b/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs index c54428e..b285350 100644 --- a/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs +++ b/plugins/dali-sharp/sharp/internal/AsyncImageLoader.cs @@ -26,7 +26,7 @@ namespace Dali { -public class AsyncImageLoader : BaseHandle { +internal class AsyncImageLoader : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal AsyncImageLoader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.AsyncImageLoader_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/BaseObject.cs b/plugins/dali-sharp/sharp/internal/BaseObject.cs index cbec751..1a71550 100644 --- a/plugins/dali-sharp/sharp/internal/BaseObject.cs +++ b/plugins/dali-sharp/sharp/internal/BaseObject.cs @@ -10,7 +10,7 @@ namespace Dali { -public class BaseObject : RefObject { +internal class BaseObject : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal BaseObject(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.BaseObject_SWIGUpcast(cPtr), cMemoryOwn) { @@ -53,7 +53,7 @@ public class BaseObject : RefObject { return ret; } - public bool DoConnectSignal(ConnectionTrackerInterface connectionTracker, string signalName, SWIGTYPE_p_FunctorDelegate functorDelegate) { + internal bool DoConnectSignal(ConnectionTrackerInterface connectionTracker, string signalName, SWIGTYPE_p_FunctorDelegate functorDelegate) { bool ret = NDalicPINVOKE.BaseObject_DoConnectSignal(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), signalName, SWIGTYPE_p_FunctorDelegate.getCPtr(functorDelegate)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/BlendEquationType.cs b/plugins/dali-sharp/sharp/internal/BlendEquationType.cs index 00af026..9b32022 100644 --- a/plugins/dali-sharp/sharp/internal/BlendEquationType.cs +++ b/plugins/dali-sharp/sharp/internal/BlendEquationType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum BlendEquationType { +internal enum BlendEquationType { ADD = 0x8006, SUBTRACT = 0x800A, REVERSE_SUBTRACT = 0x800B diff --git a/plugins/dali-sharp/sharp/internal/BlendFactorType.cs b/plugins/dali-sharp/sharp/internal/BlendFactorType.cs index 357dc9c..b662e61 100644 --- a/plugins/dali-sharp/sharp/internal/BlendFactorType.cs +++ b/plugins/dali-sharp/sharp/internal/BlendFactorType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum BlendFactorType { +internal enum BlendFactorType { ZERO = 0, ONE = 1, SRC_COLOR = 0x0300, diff --git a/plugins/dali-sharp/sharp/internal/BlendModeType.cs b/plugins/dali-sharp/sharp/internal/BlendModeType.cs index c3bdf26..c0b19fb 100644 --- a/plugins/dali-sharp/sharp/internal/BlendModeType.cs +++ b/plugins/dali-sharp/sharp/internal/BlendModeType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum BlendModeType { +internal enum BlendModeType { OFF, AUTO, ON diff --git a/plugins/dali-sharp/sharp/internal/BufferImage.cs b/plugins/dali-sharp/sharp/internal/BufferImage.cs index d93efb4..9c0a5eb 100644 --- a/plugins/dali-sharp/sharp/internal/BufferImage.cs +++ b/plugins/dali-sharp/sharp/internal/BufferImage.cs @@ -26,7 +26,7 @@ namespace Dali { -public class BufferImage : Image { +internal class BufferImage : Image { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal BufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.BufferImage_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/Builder.cs b/plugins/dali-sharp/sharp/internal/Builder.cs index 1eeb9e8..18fcff4 100644 --- a/plugins/dali-sharp/sharp/internal/Builder.cs +++ b/plugins/dali-sharp/sharp/internal/Builder.cs @@ -30,7 +30,7 @@ namespace Dali { using System.Runtime.InteropServices; -public class Builder : BaseHandle { +internal class Builder : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Builder(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Builder_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/ButtonSignal.cs b/plugins/dali-sharp/sharp/internal/ButtonSignal.cs index cd19677..65aa93b 100644 --- a/plugins/dali-sharp/sharp/internal/ButtonSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ButtonSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ButtonSignal : global::System.IDisposable { +internal class ButtonSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Camera.cs b/plugins/dali-sharp/sharp/internal/Camera.cs index 4b05430..a809e6e 100644 --- a/plugins/dali-sharp/sharp/internal/Camera.cs +++ b/plugins/dali-sharp/sharp/internal/Camera.cs @@ -26,7 +26,7 @@ namespace Dali { - public class Camera : Animatable { +internal class Camera : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Camera(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CameraActor_SWIGUpcast(cPtr), cMemoryOwn) { @@ -269,7 +269,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.FIELD_OF_VIEW).Get( ref temp ); + GetProperty( Camera.Property.FIELD_OF_VIEW).Get( out temp ); return temp; } set @@ -282,7 +282,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.ASPECT_RATIO).Get( ref temp ); + GetProperty( Camera.Property.ASPECT_RATIO).Get( out temp ); return temp; } set @@ -295,7 +295,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.NEAR_PLANE_DISTANCE).Get( ref temp ); + GetProperty( Camera.Property.NEAR_PLANE_DISTANCE).Get( out temp ); return temp; } set @@ -308,7 +308,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.FAR_PLANE_DISTANCE).Get( ref temp ); + GetProperty( Camera.Property.FAR_PLANE_DISTANCE).Get( out temp ); return temp; } set @@ -321,7 +321,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.LEFT_PLANE_DISTANCE).Get( ref temp ); + GetProperty( Camera.Property.LEFT_PLANE_DISTANCE).Get( out temp ); return temp; } set @@ -334,7 +334,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.RIGHT_PLANE_DISTANCE).Get( ref temp ); + GetProperty( Camera.Property.RIGHT_PLANE_DISTANCE).Get( out temp ); return temp; } set @@ -347,7 +347,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.TOP_PLANE_DISTANCE).Get( ref temp ); + GetProperty( Camera.Property.TOP_PLANE_DISTANCE).Get( out temp ); return temp; } set @@ -360,7 +360,7 @@ namespace Dali { get { float temp = 0.0f; - GetProperty( Camera.Property.BOTTOM_PLANE_DISTANCE).Get( ref temp ); + GetProperty( Camera.Property.BOTTOM_PLANE_DISTANCE).Get( out temp ); return temp; } set @@ -402,7 +402,7 @@ namespace Dali { get { bool temp = false; - GetProperty( Camera.Property.INVERT_Y_AXIS).Get( ref temp ); + GetProperty( Camera.Property.INVERT_Y_AXIS).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/CameraType.cs b/plugins/dali-sharp/sharp/internal/CameraType.cs index f57da90..d91e46a 100644 --- a/plugins/dali-sharp/sharp/internal/CameraType.cs +++ b/plugins/dali-sharp/sharp/internal/CameraType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum CameraType { +internal enum CameraType { FREE_LOOK, LOOK_AT_TARGET } diff --git a/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs b/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs index 527ff1c..f20aeeb 100644 --- a/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/ChildPropertyRegistration.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ChildPropertyRegistration : global::System.IDisposable { +internal class ChildPropertyRegistration : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ClampState.cs b/plugins/dali-sharp/sharp/internal/ClampState.cs deleted file mode 100644 index 60693be..0000000 --- a/plugins/dali-sharp/sharp/internal/ClampState.cs +++ /dev/null @@ -1,19 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum ClampState { - NotClamped, - ClampedToMin, - ClampedToMax -} - -} diff --git a/plugins/dali-sharp/sharp/internal/ClampState2D.cs b/plugins/dali-sharp/sharp/internal/ClampState2D.cs deleted file mode 100644 index ea62e9a..0000000 --- a/plugins/dali-sharp/sharp/internal/ClampState2D.cs +++ /dev/null @@ -1,79 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public class ClampState2D : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ClampState2D(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ClampState2D obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~ClampState2D() { - DisposeQueue.Instance.Add(this); - } - - public virtual void Dispose() { - if (!Window.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ClampState2D(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - - public ClampState x { - set { - NDalicPINVOKE.ClampState2D_x_set(swigCPtr, (int)value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - ClampState ret = (ClampState)NDalicPINVOKE.ClampState2D_x_get(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public ClampState y { - set { - NDalicPINVOKE.ClampState2D_y_set(swigCPtr, (int)value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - ClampState ret = (ClampState)NDalicPINVOKE.ClampState2D_y_get(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public ClampState2D() : this(NDalicPINVOKE.new_ClampState2D(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - -} - -} diff --git a/plugins/dali-sharp/sharp/internal/ClippingModeType.cs b/plugins/dali-sharp/sharp/internal/ClippingModeType.cs index 3578a02..5b40f8d 100644 --- a/plugins/dali-sharp/sharp/internal/ClippingModeType.cs +++ b/plugins/dali-sharp/sharp/internal/ClippingModeType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum ClippingModeType { +internal enum ClippingModeType { DISABLED, CLIP_CHILDREN } diff --git a/plugins/dali-sharp/sharp/internal/ColorMode.cs b/plugins/dali-sharp/sharp/internal/ColorMode.cs deleted file mode 100644 index aa0125b..0000000 --- a/plugins/dali-sharp/sharp/internal/ColorMode.cs +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum ColorMode { - USE_OWN_COLOR, - USE_PARENT_COLOR, - USE_OWN_MULTIPLY_PARENT_COLOR, - USE_OWN_MULTIPLY_PARENT_ALPHA -} - -} diff --git a/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs b/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs index e87416a..47e1a13 100644 --- a/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs +++ b/plugins/dali-sharp/sharp/internal/ConnectionTracker.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ConnectionTracker : ConnectionTrackerInterface { +internal class ConnectionTracker : ConnectionTrackerInterface { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ConnectionTracker(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ConnectionTracker_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs b/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs index 9f6ec66..07892e0 100644 --- a/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs +++ b/plugins/dali-sharp/sharp/internal/ConnectionTrackerInterface.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ConnectionTrackerInterface : SignalObserver { +internal class ConnectionTrackerInterface : SignalObserver { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ConnectionTrackerInterface(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ConnectionTrackerInterface_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs b/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs index c0138e6..b05ffed 100644 --- a/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs +++ b/plugins/dali-sharp/sharp/internal/ControlKeySignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ControlKeySignal : global::System.IDisposable { +internal class ControlKeySignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ControlOrientationType.cs b/plugins/dali-sharp/sharp/internal/ControlOrientationType.cs index 211e9cf..72b29fa 100644 --- a/plugins/dali-sharp/sharp/internal/ControlOrientationType.cs +++ b/plugins/dali-sharp/sharp/internal/ControlOrientationType.cs @@ -9,12 +9,12 @@ //------------------------------------------------------------------------------ namespace Dali { - -public enum ControlOrientationType { +#if false +internal enum ControlOrientationType { Up, Left, Down, Right } - +#endif } diff --git a/plugins/dali-sharp/sharp/internal/CustomActor.cs b/plugins/dali-sharp/sharp/internal/CustomActor.cs index 86b873a..3e737d6 100644 --- a/plugins/dali-sharp/sharp/internal/CustomActor.cs +++ b/plugins/dali-sharp/sharp/internal/CustomActor.cs @@ -10,7 +10,7 @@ namespace Dali { - public class CustomActor : Animatable { +internal class CustomActor : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal CustomActor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActor_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/CustomActorImpl.cs b/plugins/dali-sharp/sharp/internal/CustomActorImpl.cs index 209eaaa..a06a8a1 100644 --- a/plugins/dali-sharp/sharp/internal/CustomActorImpl.cs +++ b/plugins/dali-sharp/sharp/internal/CustomActorImpl.cs @@ -10,7 +10,7 @@ namespace Dali { -public class CustomActorImpl : RefObject { +internal class CustomActorImpl : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal CustomActorImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.CustomActorImpl_SWIGUpcast(cPtr), cMemoryOwn) { @@ -35,7 +35,7 @@ public class CustomActorImpl : RefObject { } } - public CustomActor Self() { + internal CustomActor Self() { CustomActor ret = new CustomActor(NDalicPINVOKE.CustomActorImpl_Self(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -76,7 +76,7 @@ public class CustomActorImpl : RefObject { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) { + internal virtual bool OnTouchEvent(SWIGTYPE_p_Dali__TouchEvent arg0) { bool ret = NDalicPINVOKE.CustomActorImpl_OnTouchEvent(swigCPtr, SWIGTYPE_p_Dali__TouchEvent.getCPtr(arg0)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs b/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs index aaf13e3..a146522 100644 --- a/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs +++ b/plugins/dali-sharp/sharp/internal/CustomAlgorithmInterface.cs @@ -10,7 +10,7 @@ namespace Dali { -public class CustomAlgorithmInterface : global::System.IDisposable { +internal class CustomAlgorithmInterface : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -46,13 +46,13 @@ public class CustomAlgorithmInterface : global::System.IDisposable { } - public virtual View GetNextFocusableView(View current, View proposed, View.KeyboardFocus.Direction direction) { + public virtual View GetNextFocusableView(View current, View proposed, View.Focus.Direction direction) { View ret = new View(NDalicPINVOKE.CustomAlgorithmInterface_GetNextFocusableActor(swigCPtr, View.getCPtr(current), View.getCPtr(proposed), (int)direction), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public CustomAlgorithmInterface() : this(NDalicPINVOKE.new_CustomAlgorithmInterface(), true) { + internal CustomAlgorithmInterface() : this(NDalicPINVOKE.new_CustomAlgorithmInterface(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); SwigDirectorConnect(); } @@ -70,14 +70,14 @@ public class CustomAlgorithmInterface : global::System.IDisposable { } private global::System.IntPtr SwigDirectorGetNextFocusableView(global::System.IntPtr current, global::System.IntPtr proposed, int direction) { - return View.getCPtr(GetNextFocusableView(new View(current, true), new View(proposed, true), (View.KeyboardFocus.Direction)direction)).Handle; + return View.getCPtr(GetNextFocusableView(new View(current, true), new View(proposed, true), (View.Focus.Direction)direction)).Handle; } - public delegate global::System.IntPtr SwigDelegateCustomAlgorithmInterface_0(global::System.IntPtr current, global::System.IntPtr proposed, int direction); + internal delegate global::System.IntPtr SwigDelegateCustomAlgorithmInterface_0(global::System.IntPtr current, global::System.IntPtr proposed, int direction); private SwigDelegateCustomAlgorithmInterface_0 swigDelegate0; - private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(View), typeof(View), typeof(View.KeyboardFocus.Direction) }; + private static global::System.Type[] swigMethodTypes0 = new global::System.Type[] { typeof(View), typeof(View), typeof(View.Focus.Direction) }; } } diff --git a/plugins/dali-sharp/sharp/internal/DaliException.cs b/plugins/dali-sharp/sharp/internal/DaliException.cs index 3160ef9..afd7c21 100644 --- a/plugins/dali-sharp/sharp/internal/DaliException.cs +++ b/plugins/dali-sharp/sharp/internal/DaliException.cs @@ -10,7 +10,7 @@ namespace Dali { -public class DaliException : global::System.IDisposable { +internal class DaliException : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/DefaultItemLayoutProperty.cs b/plugins/dali-sharp/sharp/internal/DefaultItemLayoutProperty.cs index 91d6251..e4eac81 100644 --- a/plugins/dali-sharp/sharp/internal/DefaultItemLayoutProperty.cs +++ b/plugins/dali-sharp/sharp/internal/DefaultItemLayoutProperty.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum DefaultItemLayoutProperty { +internal enum DefaultItemLayoutProperty { TYPE = 0, ITEM_SIZE, ORIENTATION, diff --git a/plugins/dali-sharp/sharp/internal/DefaultItemLayoutType.cs b/plugins/dali-sharp/sharp/internal/DefaultItemLayoutType.cs index b807d11..f885bdd 100644 --- a/plugins/dali-sharp/sharp/internal/DefaultItemLayoutType.cs +++ b/plugins/dali-sharp/sharp/internal/DefaultItemLayoutType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum DefaultItemLayoutType { +internal enum DefaultItemLayoutType { DEPTH, GRID, LIST, diff --git a/plugins/dali-sharp/sharp/internal/DefaultRuler.cs b/plugins/dali-sharp/sharp/internal/DefaultRuler.cs index 688aaf8..c28cc65 100644 --- a/plugins/dali-sharp/sharp/internal/DefaultRuler.cs +++ b/plugins/dali-sharp/sharp/internal/DefaultRuler.cs @@ -10,7 +10,7 @@ namespace Dali { -public class DefaultRuler : Ruler { +internal class DefaultRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal DefaultRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DefaultRuler_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/DepthFunctionType.cs b/plugins/dali-sharp/sharp/internal/DepthFunctionType.cs index b19178f..8cc779c 100644 --- a/plugins/dali-sharp/sharp/internal/DepthFunctionType.cs +++ b/plugins/dali-sharp/sharp/internal/DepthFunctionType.cs @@ -10,15 +10,15 @@ namespace Dali { -public enum DepthFunctionType { - NEVER, - ALWAYS, - LESS, - GREATER, - EQUAL, - NOT_EQUAL, - LESS_EQUAL, - GREATER_EQUAL +internal enum DepthFunctionType { + Never, + Always, + Less, + Greater, + Equal, + NotEqual, + LessEqual, + GreaterEqual } } diff --git a/plugins/dali-sharp/sharp/internal/DepthTestModeType.cs b/plugins/dali-sharp/sharp/internal/DepthTestModeType.cs index b5d8131..e290cc4 100644 --- a/plugins/dali-sharp/sharp/internal/DepthTestModeType.cs +++ b/plugins/dali-sharp/sharp/internal/DepthTestModeType.cs @@ -10,10 +10,10 @@ namespace Dali { -public enum DepthTestModeType { - OFF, - AUTO, - ON +internal enum DepthTestModeType { + Off, + Auto, + On } } diff --git a/plugins/dali-sharp/sharp/internal/DepthWriteModeType.cs b/plugins/dali-sharp/sharp/internal/DepthWriteModeType.cs index 2ca0c7eb..8e17704 100644 --- a/plugins/dali-sharp/sharp/internal/DepthWriteModeType.cs +++ b/plugins/dali-sharp/sharp/internal/DepthWriteModeType.cs @@ -10,10 +10,10 @@ namespace Dali { -public enum DepthWriteModeType { - OFF, - AUTO, - ON +internal enum DepthWriteModeType { + Off, + Auto, + On } } diff --git a/plugins/dali-sharp/sharp/internal/DisposeQueue.cs b/plugins/dali-sharp/sharp/internal/DisposeQueue.cs index 59120b2..1f9556a 100644 --- a/plugins/dali-sharp/sharp/internal/DisposeQueue.cs +++ b/plugins/dali-sharp/sharp/internal/DisposeQueue.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; namespace Dali { - public class DisposeQueue + internal class DisposeQueue { private static readonly DisposeQueue _disposableQueue = new DisposeQueue(); private List _disposables = new List(); diff --git a/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs b/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs index db7c9f9..567c05a 100644 --- a/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs +++ b/plugins/dali-sharp/sharp/internal/DragAndDropDetector.cs @@ -10,7 +10,7 @@ namespace Dali { -public class DragAndDropDetector : BaseHandle { +internal class DragAndDropDetector : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal DragAndDropDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.DragAndDropDetector_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs b/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs index f178a25..8759e44 100644 --- a/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs +++ b/plugins/dali-sharp/sharp/internal/EncodedBufferImage.cs @@ -26,7 +26,7 @@ namespace Dali { -public class EncodedBufferImage : Image { +internal class EncodedBufferImage : Image { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal EncodedBufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.EncodedBufferImage_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/EventThreadCallback.cs b/plugins/dali-sharp/sharp/internal/EventThreadCallback.cs index a9434a4..b467c69 100644 --- a/plugins/dali-sharp/sharp/internal/EventThreadCallback.cs +++ b/plugins/dali-sharp/sharp/internal/EventThreadCallback.cs @@ -18,7 +18,7 @@ namespace Dali { - public class EventThreadCallback : global::System.IDisposable + internal class EventThreadCallback : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/FaceCullingModeType.cs b/plugins/dali-sharp/sharp/internal/FaceCullingModeType.cs index 4fc9f08..54a9d45 100644 --- a/plugins/dali-sharp/sharp/internal/FaceCullingModeType.cs +++ b/plugins/dali-sharp/sharp/internal/FaceCullingModeType.cs @@ -10,11 +10,11 @@ namespace Dali { -public enum FaceCullingModeType { - NONE, - FRONT, - BACK, - FRONT_AND_BACK +internal enum FaceCullingModeType { + None, + Front, + Back, + FrontAndBack } } diff --git a/plugins/dali-sharp/sharp/internal/FilterModeType.cs b/plugins/dali-sharp/sharp/internal/FilterModeType.cs index 847c406..acb1a41 100644 --- a/plugins/dali-sharp/sharp/internal/FilterModeType.cs +++ b/plugins/dali-sharp/sharp/internal/FilterModeType.cs @@ -10,15 +10,15 @@ namespace Dali { -public enum FilterModeType { - NONE = 0, - DEFAULT, - NEAREST, - LINEAR, - NEAREST_MIPMAP_NEAREST, - LINEAR_MIPMAP_NEAREST, - NEAREST_MIPMAP_LINEAR, - LINEAR_MIPMAP_LINEAR +internal enum FilterModeType { + None = 0, + Default, + Nearest, + Linear, + NearestMipmapNearest, + LinearMipmapNearest, + NearestMipmapLinear, + LinearMipmapLinear } } diff --git a/plugins/dali-sharp/sharp/internal/FittingModeType.cs b/plugins/dali-sharp/sharp/internal/FittingModeType.cs index b8b5ba1..9b06ae5 100644 --- a/plugins/dali-sharp/sharp/internal/FittingModeType.cs +++ b/plugins/dali-sharp/sharp/internal/FittingModeType.cs @@ -10,11 +10,11 @@ namespace Dali { -public enum FittingModeType { - SHRINK_TO_FIT, - SCALE_TO_FILL, - FIT_WIDTH, - FIT_HEIGHT +internal enum FittingModeType { + ShrinkToFit, + ScaleToFill, + FitWidth, + FitHeight } } diff --git a/plugins/dali-sharp/sharp/internal/FixedRuler.cs b/plugins/dali-sharp/sharp/internal/FixedRuler.cs index ae26c3a..641529b 100644 --- a/plugins/dali-sharp/sharp/internal/FixedRuler.cs +++ b/plugins/dali-sharp/sharp/internal/FixedRuler.cs @@ -10,7 +10,7 @@ namespace Dali { -public class FixedRuler : Ruler { +internal class FixedRuler : Ruler { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal FixedRuler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FixedRuler_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/FloatSignal.cs b/plugins/dali-sharp/sharp/internal/FloatSignal.cs index 7d5ba42..5a6b3cd 100644 --- a/plugins/dali-sharp/sharp/internal/FloatSignal.cs +++ b/plugins/dali-sharp/sharp/internal/FloatSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class FloatSignal : global::System.IDisposable { +internal class FloatSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs b/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs index 3304d26..988f16c 100644 --- a/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/FocusChangedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class FocusChangedSignal : global::System.IDisposable { +internal class FocusChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs b/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs index 43494c2..a67ba0c 100644 --- a/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/FocusGroupChangedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class FocusGroupChangedSignal : global::System.IDisposable { +internal class FocusGroupChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/FrameBuffer.cs b/plugins/dali-sharp/sharp/internal/FrameBuffer.cs index 41e6c35..a7021e5 100644 --- a/plugins/dali-sharp/sharp/internal/FrameBuffer.cs +++ b/plugins/dali-sharp/sharp/internal/FrameBuffer.cs @@ -26,7 +26,7 @@ namespace Dali { -public class FrameBuffer : BaseHandle { +internal class FrameBuffer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal FrameBuffer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FrameBuffer_SWIGUpcast(cPtr), cMemoryOwn) { @@ -61,68 +61,21 @@ public class FrameBuffer : BaseHandle { } - public class Attachment : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Attachment(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Attachment obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Attachment() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_FrameBuffer_Attachment(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Attachment() : this(NDalicPINVOKE.new_FrameBuffer_Attachment(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public enum Mask { + public class Attachment + { + public enum Mask + { NONE = 0, DEPTH = 1 << 0, STENCIL = 1 << 1, DEPTH_STENCIL = DEPTH|STENCIL } - } public FrameBuffer (uint width, uint height, uint attachments) : this (NDalicPINVOKE.FrameBuffer_New(width, height, attachments), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public FrameBuffer(FrameBuffer handle) : this(NDalicPINVOKE.new_FrameBuffer__SWIG_1(FrameBuffer.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static FrameBuffer DownCast(BaseHandle handle) { - FrameBuffer ret = new FrameBuffer(NDalicPINVOKE.FrameBuffer_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public FrameBuffer Assign(FrameBuffer handle) { - FrameBuffer ret = new FrameBuffer(NDalicPINVOKE.FrameBuffer_Assign(swigCPtr, FrameBuffer.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public void AttachColorTexture(Texture texture) { NDalicPINVOKE.FrameBuffer_AttachColorTexture__SWIG_0(swigCPtr, Texture.getCPtr(texture)); diff --git a/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs b/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs index c7b428c..3975ce3 100644 --- a/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs +++ b/plugins/dali-sharp/sharp/internal/FrameBufferImage.cs @@ -26,7 +26,7 @@ namespace Dali { -public class FrameBufferImage : Image { +internal class FrameBufferImage : Image { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal FrameBufferImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FrameBufferImage_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs b/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs index 5f0ce58..fed8f0d 100644 --- a/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs +++ b/plugins/dali-sharp/sharp/internal/GaussianBlurView.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -public class GaussianBlurView : View { +internal class GaussianBlurView : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal GaussianBlurView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GaussianBlurView_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs b/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs index 8fe1248..40d1bfd 100644 --- a/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs +++ b/plugins/dali-sharp/sharp/internal/GaussianBlurViewSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class GaussianBlurViewSignal : global::System.IDisposable { +internal class GaussianBlurViewSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Geometry.cs b/plugins/dali-sharp/sharp/internal/Geometry.cs index 69b0ddf..d185a11 100644 --- a/plugins/dali-sharp/sharp/internal/Geometry.cs +++ b/plugins/dali-sharp/sharp/internal/Geometry.cs @@ -26,7 +26,7 @@ namespace Dali { -public class Geometry : BaseHandle { +internal class Geometry : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Geometry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Geometry_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/GestureDetector.cs b/plugins/dali-sharp/sharp/internal/GestureDetector.cs index ef20276..0b65dc3 100644 --- a/plugins/dali-sharp/sharp/internal/GestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/GestureDetector.cs @@ -10,7 +10,7 @@ namespace Dali { -public class GestureDetector : BaseHandle { +internal class GestureDetector : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal GestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GestureDetector_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/GradientVisualSpreadMethodType.cs b/plugins/dali-sharp/sharp/internal/GradientVisualSpreadMethodType.cs index acb0d2e..04caa12 100644 --- a/plugins/dali-sharp/sharp/internal/GradientVisualSpreadMethodType.cs +++ b/plugins/dali-sharp/sharp/internal/GradientVisualSpreadMethodType.cs @@ -10,10 +10,10 @@ namespace Dali { -public enum GradientVisualSpreadMethodType { - PAD, - REFLECT, - REPEAT +internal enum GradientVisualSpreadMethodType { + Pad, + Reflect, + Repeat } } diff --git a/plugins/dali-sharp/sharp/internal/GradientVisualUnitsType.cs b/plugins/dali-sharp/sharp/internal/GradientVisualUnitsType.cs index ba6fc00..28b97ea 100644 --- a/plugins/dali-sharp/sharp/internal/GradientVisualUnitsType.cs +++ b/plugins/dali-sharp/sharp/internal/GradientVisualUnitsType.cs @@ -10,9 +10,9 @@ namespace Dali { -public enum GradientVisualUnitsType { - OBJECT_BOUNDING_BOX, - USER_SPACE +internal enum GradientVisualUnitsType { + ObjectBoundingBox, + UserSpace } } diff --git a/plugins/dali-sharp/sharp/internal/ImageSignal.cs b/plugins/dali-sharp/sharp/internal/ImageSignal.cs index 47f7247..b90e682 100644 --- a/plugins/dali-sharp/sharp/internal/ImageSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ImageSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ImageSignal : global::System.IDisposable { +internal class ImageSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Item.cs b/plugins/dali-sharp/sharp/internal/Item.cs index b789571..56c5d4e 100644 --- a/plugins/dali-sharp/sharp/internal/Item.cs +++ b/plugins/dali-sharp/sharp/internal/Item.cs @@ -10,7 +10,7 @@ namespace Dali { -public class Item : global::System.IDisposable { +internal class Item : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ItemContainer.cs b/plugins/dali-sharp/sharp/internal/ItemContainer.cs index 2472eca..ffbc1b7 100644 --- a/plugins/dali-sharp/sharp/internal/ItemContainer.cs +++ b/plugins/dali-sharp/sharp/internal/ItemContainer.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable +internal class ItemContainer : global::System.IDisposable, global::System.Collections.IEnumerable , global::System.Collections.Generic.IEnumerable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/plugins/dali-sharp/sharp/internal/ItemFactory.cs b/plugins/dali-sharp/sharp/internal/ItemFactory.cs index d0c0163..ce5edea 100644 --- a/plugins/dali-sharp/sharp/internal/ItemFactory.cs +++ b/plugins/dali-sharp/sharp/internal/ItemFactory.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ItemFactory : global::System.IDisposable { +internal class ItemFactory : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs b/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs index 9c98bd8..c41e4e8 100644 --- a/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs +++ b/plugins/dali-sharp/sharp/internal/ItemIdContainer.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable +internal class ItemIdContainer : global::System.IDisposable, global::System.Collections.IEnumerable , global::System.Collections.Generic.IList { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/plugins/dali-sharp/sharp/internal/ItemLayout.cs b/plugins/dali-sharp/sharp/internal/ItemLayout.cs index 735efce..4463f58 100644 --- a/plugins/dali-sharp/sharp/internal/ItemLayout.cs +++ b/plugins/dali-sharp/sharp/internal/ItemLayout.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ItemLayout : RefObject { +internal class ItemLayout : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ItemLayout(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ItemLayout_SWIGUpcast(cPtr), cMemoryOwn) { @@ -44,18 +44,6 @@ public class ItemLayout : RefObject { } } - - public void SetOrientation(ControlOrientationType orientation) { - NDalicPINVOKE.ItemLayout_SetOrientation(swigCPtr, (int)orientation); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ControlOrientationType GetOrientation() { - ControlOrientationType ret = (ControlOrientationType)NDalicPINVOKE.ItemLayout_GetOrientation(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void SetLayoutProperties(Property.Map properties) { NDalicPINVOKE.ItemLayout_SetLayoutProperties(swigCPtr, Property.Map.getCPtr(properties)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -142,7 +130,7 @@ public class ItemLayout : RefObject { return ret; } - public virtual int GetNextFocusItemID(int itemID, int maxItems, View.KeyboardFocus.Direction direction, bool loopEnabled) { + public virtual int GetNextFocusItemID(int itemID, int maxItems, View.Focus.Direction direction, bool loopEnabled) { int ret = NDalicPINVOKE.ItemLayout_GetNextFocusItemID(swigCPtr, itemID, maxItems, (int)direction, loopEnabled); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/ItemRange.cs b/plugins/dali-sharp/sharp/internal/ItemRange.cs index fe82cf4..514091b 100644 --- a/plugins/dali-sharp/sharp/internal/ItemRange.cs +++ b/plugins/dali-sharp/sharp/internal/ItemRange.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ItemRange : global::System.IDisposable { +internal class ItemRange : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ItemView.cs b/plugins/dali-sharp/sharp/internal/ItemView.cs index 5c791df..3494625 100644 --- a/plugins/dali-sharp/sharp/internal/ItemView.cs +++ b/plugins/dali-sharp/sharp/internal/ItemView.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -public class ItemView : Scrollable { +internal class ItemView : Scrollable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ItemView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ItemView_SWIGUpcast(cPtr), cMemoryOwn) { @@ -344,19 +344,12 @@ public class ItemView : Scrollable { return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000 - } - public float MinimumSwipeSpeed { get { float temp = 0.0f; - GetProperty( ItemView.Property.MINIMUM_SWIPE_SPEED).Get( ref temp ); + GetProperty( ItemView.Property.MINIMUM_SWIPE_SPEED).Get( out temp ); return temp; } set @@ -369,7 +362,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.MINIMUM_SWIPE_DISTANCE).Get( ref temp ); + GetProperty( ItemView.Property.MINIMUM_SWIPE_DISTANCE).Get( out temp ); return temp; } set @@ -382,7 +375,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get( ref temp ); + GetProperty( ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get( out temp ); return temp; } set @@ -395,7 +388,7 @@ public class ItemView : Scrollable { get { bool temp = false; - GetProperty( ItemView.Property.SNAP_TO_ITEM_ENABLED).Get( ref temp ); + GetProperty( ItemView.Property.SNAP_TO_ITEM_ENABLED).Get( out temp ); return temp; } set @@ -408,7 +401,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.REFRESH_INTERVAL).Get( ref temp ); + GetProperty( ItemView.Property.REFRESH_INTERVAL).Get( out temp ); return temp; } set @@ -421,7 +414,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.LAYOUT_POSITION).Get( ref temp ); + GetProperty( ItemView.Property.LAYOUT_POSITION).Get( out temp ); return temp; } set @@ -434,7 +427,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.SCROLL_SPEED).Get( ref temp ); + GetProperty( ItemView.Property.SCROLL_SPEED).Get( out temp ); return temp; } set @@ -447,7 +440,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.OVERSHOOT).Get( ref temp ); + GetProperty( ItemView.Property.OVERSHOOT).Get( out temp ); return temp; } set @@ -473,7 +466,7 @@ public class ItemView : Scrollable { get { int temp = 0; - GetProperty( ItemView.Property.LAYOUT_ORIENTATION).Get( ref temp ); + GetProperty( ItemView.Property.LAYOUT_ORIENTATION).Get( out temp ); return temp; } set @@ -486,7 +479,7 @@ public class ItemView : Scrollable { get { float temp = 0.0f; - GetProperty( ItemView.Property.SCROLL_CONTENT_SIZE).Get( ref temp ); + GetProperty( ItemView.Property.SCROLL_CONTENT_SIZE).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs b/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs index 79109ad..8cd123f 100644 --- a/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs +++ b/plugins/dali-sharp/sharp/internal/KeyEventSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class KeyEventSignal : global::System.IDisposable { +internal class KeyEventSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs b/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs index 08670d2..7b3853d 100644 --- a/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs +++ b/plugins/dali-sharp/sharp/internal/KeyInputFocusSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class KeyInputFocusSignal : global::System.IDisposable { +internal class KeyInputFocusSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs b/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs index 61657d6..d87cea9 100644 --- a/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs +++ b/plugins/dali-sharp/sharp/internal/LinearConstrainer.cs @@ -26,7 +26,7 @@ namespace Dali { -public class LinearConstrainer : BaseHandle { +internal class LinearConstrainer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal LinearConstrainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LinearConstrainer_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/LoadingState.cs b/plugins/dali-sharp/sharp/internal/LoadingState.cs index 0994278..1eed21a 100644 --- a/plugins/dali-sharp/sharp/internal/LoadingState.cs +++ b/plugins/dali-sharp/sharp/internal/LoadingState.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum LoadingState { +internal enum LoadingState { ResourceLoading, ResourceLoadingSucceeded, ResourceLoadingFailed diff --git a/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs index f4c4ecd..f7faac3 100644 --- a/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/LongPressGestureDetectedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class LongPressGestureDetectedSignal : global::System.IDisposable { +internal class LongPressGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs b/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs index 7eb839e..4f23f3b 100644 --- a/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/LongPressGestureDetector.cs @@ -29,7 +29,7 @@ namespace Dali { using System; using System.Runtime.InteropServices; -public class LongPressGestureDetector : GestureDetector { +internal class LongPressGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal LongPressGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.LongPressGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/MeshVisualShadingModeValue.cs b/plugins/dali-sharp/sharp/internal/MeshVisualShadingModeValue.cs index 0740b7a..89cc0c9 100644 --- a/plugins/dali-sharp/sharp/internal/MeshVisualShadingModeValue.cs +++ b/plugins/dali-sharp/sharp/internal/MeshVisualShadingModeValue.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum MeshVisualShadingModeValue { +internal enum MeshVisualShadingModeValue { TEXTURELESS_WITH_DIFFUSE_LIGHTING, TEXTURED_WITH_SPECULAR_LIGHTING, TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING diff --git a/plugins/dali-sharp/sharp/internal/Meta.cs b/plugins/dali-sharp/sharp/internal/Meta.cs deleted file mode 100644 index 712998c..0000000 --- a/plugins/dali-sharp/sharp/internal/Meta.cs +++ /dev/null @@ -1,17 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum Meta { - DIMENSION_COUNT = 2 -} - -} diff --git a/plugins/dali-sharp/sharp/internal/Model3dView.cs b/plugins/dali-sharp/sharp/internal/Model3dView.cs index c3eb6f6..973c9f1 100644 --- a/plugins/dali-sharp/sharp/internal/Model3dView.cs +++ b/plugins/dali-sharp/sharp/internal/Model3dView.cs @@ -26,7 +26,7 @@ namespace Dali { -public class Model3dView : View { +internal class Model3dView : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Model3dView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Model3dView_SWIGUpcast(cPtr), cMemoryOwn) { @@ -130,13 +130,6 @@ public class Model3dView : View { return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000 - } - public enum IluminationTypeEnum { DIFFUSE, DIFFUSE_WITH_TEXTURE, @@ -187,7 +180,7 @@ public class Model3dView : View { get { int temp = 0; - GetProperty( Model3dView.Property.ILLUMINATION_TYPE).Get( ref temp ); + GetProperty( Model3dView.Property.ILLUMINATION_TYPE).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/NDalic.cs b/plugins/dali-sharp/sharp/internal/NDalic.cs index d748edd..20fe141 100644 --- a/plugins/dali-sharp/sharp/internal/NDalic.cs +++ b/plugins/dali-sharp/sharp/internal/NDalic.cs @@ -23,7 +23,7 @@ public class NDalic { public static readonly int VISUAL_PROPERTY_MIX_COLOR = NDalicManualPINVOKE.Visual_Property_MIX_COLOR_get(); public static readonly int IMAGE_VISUAL_BORDER = NDalicManualPINVOKE.Image_Visual_BORDER_get(); - public static void DaliAssertMessage(string location, string condition) { + internal static void DaliAssertMessage(string location, string condition) { NDalicPINVOKE.DaliAssertMessage(location, condition); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -82,234 +82,6 @@ public class NDalic { return ret; } - public static Radian ANGLE_360 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_360_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_315 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_315_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_270 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_270_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_225 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_225_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_180 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_180_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_135 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_135_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_120 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_120_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_90 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_90_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_60 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_60_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_45 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_45_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_30 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_30_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_0 { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_0_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static bool EqualTo(Degree lhs, Degree rhs) { - bool ret = NDalicPINVOKE.EqualTo__SWIG_5(Degree.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Degree lhs, Degree rhs) { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_4(Degree.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Degree Clamp(Degree angle, float min, float max) { - Degree ret = new Degree(NDalicPINVOKE.Clamp__SWIG_3(Degree.getCPtr(angle), min, max), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool EqualTo(Radian lhs, Radian rhs) { - bool ret = NDalicPINVOKE.EqualTo__SWIG_6(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Radian lhs, Radian rhs) { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_5(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool EqualTo(Radian lhs, Degree rhs) { - bool ret = NDalicPINVOKE.EqualTo__SWIG_7(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Radian lhs, Degree rhs) { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_6(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool EqualTo(Degree lhs, Radian rhs) { - bool ret = NDalicPINVOKE.EqualTo__SWIG_8(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Degree lhs, Radian rhs) { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_7(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool GreaterThan(Radian lhs, Radian rhs) { - bool ret = NDalicPINVOKE.GreaterThan__SWIG_0(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool GreaterThan(Radian lhs, Degree rhs) { - bool ret = NDalicPINVOKE.GreaterThan__SWIG_1(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool GreaterThan(Degree lhs, Radian rhs) { - bool ret = NDalicPINVOKE.GreaterThan__SWIG_2(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool LessThan(Radian lhs, Radian rhs) { - bool ret = NDalicPINVOKE.LessThan__SWIG_0(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool LessThan(Radian lhs, Degree rhs) { - bool ret = NDalicPINVOKE.LessThan__SWIG_1(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool LessThan(Degree lhs, Radian rhs) { - bool ret = NDalicPINVOKE.LessThan__SWIG_2(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Radian Multiply(Radian lhs, float rhs) { - Radian ret = new Radian(NDalicPINVOKE.Multiply(Radian.getCPtr(lhs), rhs), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Radian Subtract(Radian arg0) { - Radian ret = new Radian(NDalicPINVOKE.Subtract(Radian.getCPtr(arg0)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Radian Clamp(Radian angle, float min, float max) { - Radian ret = new Radian(NDalicPINVOKE.Clamp__SWIG_4(Radian.getCPtr(angle), min, max), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static float Range(float f0, float f1) { - float ret = NDalicPINVOKE.Range(f0, f1); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Vector4 Axis() { - Vector4 ret = new Vector4(NDalicPINVOKE.Axis(), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public static bool EqualTo(AngleAxis lhs, AngleAxis rhs) { bool ret = NDalicPINVOKE.EqualTo__SWIG_9(AngleAxis.getCPtr(lhs), AngleAxis.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -358,87 +130,49 @@ public class NDalic { return ret; } - public static float WrapInDomain(float x, float start, float end) { - float ret = NDalicPINVOKE.WrapInDomain(x, start, end); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static float ShortestDistanceInDomain(float a, float b, float start, float end) { - float ret = NDalicPINVOKE.ShortestDistanceInDomain(a, b, start, end); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static string GetName(Property.Type type) { - string ret = NDalicPINVOKE.GetName((int)type); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static BaseObject GetImplementation(BaseHandle handle) { + internal static BaseObject GetImplementation(BaseHandle handle) { BaseObject ret = new BaseObject(NDalicPINVOKE.GetImplementation(BaseHandle.getCPtr(handle)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static bool LessThan(BaseHandle lhs, BaseHandle rhs) { - bool ret = NDalicPINVOKE.LessThan__SWIG_3(BaseHandle.getCPtr(lhs), BaseHandle.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static PropertyCondition LessThanCondition(float arg) { + internal static PropertyCondition LessThanCondition(float arg) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.LessThanCondition(arg), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static PropertyCondition GreaterThanCondition(float arg) { + internal static PropertyCondition GreaterThanCondition(float arg) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.GreaterThanCondition(arg), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static PropertyCondition InsideCondition(float arg0, float arg1) { + internal static PropertyCondition InsideCondition(float arg0, float arg1) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.InsideCondition(arg0, arg1), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static PropertyCondition OutsideCondition(float arg0, float arg1) { + internal static PropertyCondition OutsideCondition(float arg0, float arg1) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.OutsideCondition(arg0, arg1), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static PropertyCondition StepCondition(float stepAmount, float initialValue) { + internal static PropertyCondition StepCondition(float stepAmount, float initialValue) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.StepCondition__SWIG_0(stepAmount, initialValue), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static PropertyCondition StepCondition(float stepAmount) { + internal static PropertyCondition StepCondition(float stepAmount) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.StepCondition__SWIG_1(stepAmount), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static PropertyCondition VariableStepCondition(VectorFloat steps) { - PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.VariableStepCondition(VectorFloat.getCPtr(steps)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static int WEIGHT { - get { - int ret = NDalicPINVOKE.WEIGHT_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static bool RegisterType(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) { + internal static bool RegisterType(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) { System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(f); { bool ret = NDalicPINVOKE.RegisterType(name, SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip)); @@ -447,7 +181,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public static bool RegisterProperty(string objectName, string name, int index, Property.Type type, System.Delegate setFunc, System.Delegate getFunc) { + internal static bool RegisterProperty(string objectName, string name, int index, Property.Type type, System.Delegate setFunc, System.Delegate getFunc) { System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(setFunc); System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerForDelegate(getFunc); { @@ -780,7 +514,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float MACHINE_EPSILON_0 { + internal static float MACHINE_EPSILON_0 { get { float ret = NDalicPINVOKE.MACHINE_EPSILON_0_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -788,7 +522,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float MACHINE_EPSILON_1 { + internal static float MACHINE_EPSILON_1 { get { float ret = NDalicPINVOKE.MACHINE_EPSILON_1_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -796,7 +530,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float MACHINE_EPSILON_10 { + internal static float MACHINE_EPSILON_10 { get { float ret = NDalicPINVOKE.MACHINE_EPSILON_10_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -804,7 +538,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float MACHINE_EPSILON_100 { + internal static float MACHINE_EPSILON_100 { get { float ret = NDalicPINVOKE.MACHINE_EPSILON_100_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -812,7 +546,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float MACHINE_EPSILON_1000 { + internal static float MACHINE_EPSILON_1000 { get { float ret = NDalicPINVOKE.MACHINE_EPSILON_1000_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -820,7 +554,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float MACHINE_EPSILON_10000 { + internal static float MACHINE_EPSILON_10000 { get { float ret = NDalicPINVOKE.MACHINE_EPSILON_10000_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -828,55 +562,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static float PI { - get { - float ret = NDalicPINVOKE.PI_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float PI_2 { - get { - float ret = NDalicPINVOKE.PI_2_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float PI_4 { - get { - float ret = NDalicPINVOKE.PI_4_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float PI_OVER_180 { - get { - float ret = NDalicPINVOKE.PI_OVER_180_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float ONE80_OVER_PI { - get { - float ret = NDalicPINVOKE.ONE80_OVER_PI_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static ResizePolicyType ResizePolicyDefault { - get { - ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.ResizePolicyDefault_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static PixelFormat FIRST_VALID_PIXEL_FORMAT { + internal static PixelFormat FIRST_VALID_PIXEL_FORMAT { get { PixelFormat ret = (PixelFormat)NDalicPINVOKE.FIRST_VALID_PIXEL_FORMAT_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -884,7 +570,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static PixelFormat LAST_VALID_PIXEL_FORMAT { + internal static PixelFormat LAST_VALID_PIXEL_FORMAT { get { PixelFormat ret = (PixelFormat)NDalicPINVOKE.LAST_VALID_PIXEL_FORMAT_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -892,24 +578,24 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static bool HasAlpha(PixelFormat pixelformat) { + internal static bool HasAlpha(PixelFormat pixelformat) { bool ret = NDalicPINVOKE.HasAlpha((int)pixelformat); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static uint GetBytesPerPixel(PixelFormat pixelFormat) { + internal static uint GetBytesPerPixel(PixelFormat pixelFormat) { uint ret = NDalicPINVOKE.GetBytesPerPixel((int)pixelFormat); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static void GetAlphaOffsetAndMask(PixelFormat pixelFormat, SWIGTYPE_p_int byteOffset, SWIGTYPE_p_int bitMask) { + internal static void GetAlphaOffsetAndMask(PixelFormat pixelFormat, SWIGTYPE_p_int byteOffset, SWIGTYPE_p_int bitMask) { NDalicPINVOKE.GetAlphaOffsetAndMask((int)pixelFormat, SWIGTYPE_p_int.getCPtr(byteOffset), SWIGTYPE_p_int.getCPtr(bitMask)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static uint POSITIVE_X { + internal static uint POSITIVE_X { get { uint ret = NDalicPINVOKE.POSITIVE_X_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -917,7 +603,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static uint NEGATIVE_X { + internal static uint NEGATIVE_X { get { uint ret = NDalicPINVOKE.NEGATIVE_X_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -925,7 +611,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static uint POSITIVE_Y { + internal static uint POSITIVE_Y { get { uint ret = NDalicPINVOKE.POSITIVE_Y_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -933,7 +619,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static uint NEGATIVE_Y { + internal static uint NEGATIVE_Y { get { uint ret = NDalicPINVOKE.NEGATIVE_Y_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -941,7 +627,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static uint POSITIVE_Z { + internal static uint POSITIVE_Z { get { uint ret = NDalicPINVOKE.POSITIVE_Z_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -949,7 +635,7 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static uint NEGATIVE_Z { + internal static uint NEGATIVE_Z { get { uint ret = NDalicPINVOKE.NEGATIVE_Z_get(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -957,11 +643,6 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor } } - public static void UnparentAndReset(View view) { - NDalicPINVOKE.UnparentAndReset(View.getCPtr(view)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static void Raise(View view) { NDalicPINVOKE.Raise(View.getCPtr(view)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -992,159 +673,105 @@ System.IntPtr ip2 = System.Runtime.InteropServices.Marshal.GetFunctionPointerFor if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static FittingModeType FittingModeDefault { - get { - FittingModeType ret = (FittingModeType)NDalicPINVOKE.FittingModeDefault_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static SamplingModeType DEFAULT { - get { - SamplingModeType ret = (SamplingModeType)NDalicPINVOKE.DEFAULT_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static ViewImpl GetImplementation(View handle) { + internal static ViewImpl GetImplementation(View handle) { ViewImpl ret = new ViewImpl(NDalicPINVOKE.GetImplementation__SWIG_0(View.getCPtr(handle)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static bool IsVertical(ControlOrientationType orientation) { - bool ret = NDalicPINVOKE.IsVertical((int)orientation); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool IsHorizontal(ControlOrientationType orientation) { - bool ret = NDalicPINVOKE.IsHorizontal((int)orientation); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t NewItemLayout(DefaultItemLayoutType type) { + internal static SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t NewItemLayout(DefaultItemLayoutType type) { SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t ret = new SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t(NDalicPINVOKE.NewItemLayout((int)type), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static uint DEFAULT_RENDERING_BACKEND { - get { - uint ret = NDalicPINVOKE.DEFAULT_RENDERING_BACKEND_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static PixelData LoadImageSynchronously(string url) { - PixelData ret = new PixelData(NDalicPINVOKE.LoadImageSynchronously__SWIG_0(url), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static PixelData LoadImageSynchronously(string url, Uint16Pair dimensions) { - PixelData ret = new PixelData(NDalicPINVOKE.LoadImageSynchronously__SWIG_1(url, Uint16Pair.getCPtr(dimensions)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static PixelData LoadImageSynchronously(string url, Uint16Pair dimensions, FittingModeType fittingMode, SamplingModeType samplingMode, bool orientationCorrection) { - PixelData ret = new PixelData(NDalicPINVOKE.LoadImageSynchronously__SWIG_2(url, Uint16Pair.getCPtr(dimensions), (int)fittingMode, (int)samplingMode, orientationCorrection), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static void SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface arg1) { + internal static void SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface arg1) { NDalicPINVOKE.SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager.getCPtr(keyboardFocusManager), CustomAlgorithmInterface.getCPtr(arg1)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static readonly int VISUAL_PROPERTY_TYPE = NDalicPINVOKE.VISUAL_PROPERTY_TYPE_get(); - public static readonly int VISUAL_PROPERTY_SHADER = NDalicPINVOKE.VISUAL_PROPERTY_SHADER_get(); - - public static readonly int VISUAL_SHADER_VERTEX = NDalicPINVOKE.VISUAL_SHADER_VERTEX_get(); - public static readonly int VISUAL_SHADER_FRAGMENT = NDalicPINVOKE.VISUAL_SHADER_FRAGMENT_get(); - public static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_X = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_X_get(); - public static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_Y = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_Y_get(); - public static readonly int VISUAL_SHADER_HINTS = NDalicPINVOKE.VISUAL_SHADER_HINTS_get(); - - public static readonly int BORDER_VISUAL_COLOR = NDalicPINVOKE.BORDER_VISUAL_COLOR_get(); - public static readonly int BORDER_VISUAL_SIZE = NDalicPINVOKE.BORDER_VISUAL_SIZE_get(); - public static readonly int BORDER_VISUAL_ANTI_ALIASING = NDalicPINVOKE.BORDER_VISUAL_ANTI_ALIASING_get(); - - public static readonly int COLOR_VISUAL_MIX_COLOR = NDalicPINVOKE.COLOR_VISUAL_MIX_COLOR_get(); - - public static readonly int GRADIENT_VISUAL_START_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_START_POSITION_get(); - public static readonly int GRADIENT_VISUAL_END_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_END_POSITION_get(); - public static readonly int GRADIENT_VISUAL_CENTER = NDalicPINVOKE.GRADIENT_VISUAL_CENTER_get(); - public static readonly int GRADIENT_VISUAL_RADIUS = NDalicPINVOKE.GRADIENT_VISUAL_RADIUS_get(); - public static readonly int GRADIENT_VISUAL_STOP_OFFSET = NDalicPINVOKE.GRADIENT_VISUAL_STOP_OFFSET_get(); - public static readonly int GRADIENT_VISUAL_STOP_COLOR = NDalicPINVOKE.GRADIENT_VISUAL_STOP_COLOR_get(); - public static readonly int GRADIENT_VISUAL_UNITS = NDalicPINVOKE.GRADIENT_VISUAL_UNITS_get(); - public static readonly int GRADIENT_VISUAL_SPREAD_METHOD = NDalicPINVOKE.GRADIENT_VISUAL_SPREAD_METHOD_get(); - - public static readonly int IMAGE_VISUAL_URL = NDalicPINVOKE.IMAGE_VISUAL_URL_get(); - public static readonly int IMAGE_VISUAL_FITTING_MODE = NDalicPINVOKE.IMAGE_VISUAL_FITTING_MODE_get(); - public static readonly int IMAGE_VISUAL_SAMPLING_MODE = NDalicPINVOKE.IMAGE_VISUAL_SAMPLING_MODE_get(); - public static readonly int IMAGE_VISUAL_DESIRED_WIDTH = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_WIDTH_get(); - public static readonly int IMAGE_VISUAL_DESIRED_HEIGHT = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_HEIGHT_get(); - public static readonly int IMAGE_VISUAL_SYNCHRONOUS_LOADING = NDalicPINVOKE.IMAGE_VISUAL_SYNCHRONOUS_LOADING_get(); - public static readonly int IMAGE_VISUAL_BORDER_ONLY = NDalicPINVOKE.IMAGE_VISUAL_BORDER_ONLY_get(); - public static readonly int IMAGE_VISUAL_PIXEL_AREA = NDalicPINVOKE.IMAGE_VISUAL_PIXEL_AREA_get(); - public static readonly int IMAGE_VISUAL_WRAP_MODE_U = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_U_get(); - public static readonly int IMAGE_VISUAL_WRAP_MODE_V = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_V_get(); - - public static readonly int MESH_VISUAL_OBJECT_URL = NDalicPINVOKE.MESH_VISUAL_OBJECT_URL_get(); - public static readonly int MESH_VISUAL_MATERIAL_URL = NDalicPINVOKE.MESH_VISUAL_MATERIAL_URL_get(); - public static readonly int MESH_VISUAL_TEXTURES_PATH = NDalicPINVOKE.MESH_VISUAL_TEXTURES_PATH_get(); - public static readonly int MESH_VISUAL_SHADING_MODE = NDalicPINVOKE.MESH_VISUAL_SHADING_MODE_get(); - public static readonly int MESH_VISUAL_USE_MIPMAPPING = NDalicPINVOKE.MESH_VISUAL_USE_MIPMAPPING_get(); - public static readonly int MESH_VISUAL_USE_SOFT_NORMALS = NDalicPINVOKE.MESH_VISUAL_USE_SOFT_NORMALS_get(); - public static readonly int MESH_VISUAL_LIGHT_POSITION = NDalicPINVOKE.MESH_VISUAL_LIGHT_POSITION_get(); - - public static readonly int PRIMITIVE_VISUAL_SHAPE = NDalicPINVOKE.PRIMITIVE_VISUAL_SHAPE_get(); - public static readonly int PRIMITIVE_VISUAL_MIX_COLOR = NDalicPINVOKE.PRIMITIVE_VISUAL_MIX_COLOR_get(); - public static readonly int PRIMITIVE_VISUAL_SLICES = NDalicPINVOKE.PRIMITIVE_VISUAL_SLICES_get(); - public static readonly int PRIMITIVE_VISUAL_STACKS = NDalicPINVOKE.PRIMITIVE_VISUAL_STACKS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_TOP_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_HEIGHT = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_HEIGHT_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_RADIUS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_DIMENSIONS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_DIMENSIONS_get(); - public static readonly int PRIMITIVE_VISUAL_BEVEL_PERCENTAGE = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE_get(); - public static readonly int PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS_get(); - public static readonly int PRIMITIVE_VISUAL_LIGHT_POSITION = NDalicPINVOKE.PRIMITIVE_VISUAL_LIGHT_POSITION_get(); - - public static readonly int TEXT_VISUAL_TEXT = NDalicPINVOKE.TEXT_VISUAL_TEXT_get(); - public static readonly int TEXT_VISUAL_FONT_FAMILY = NDalicPINVOKE.TEXT_VISUAL_FONT_FAMILY_get(); - public static readonly int TEXT_VISUAL_FONT_STYLE = NDalicPINVOKE.TEXT_VISUAL_FONT_STYLE_get(); - public static readonly int TEXT_VISUAL_POINT_SIZE = NDalicPINVOKE.TEXT_VISUAL_POINT_SIZE_get(); - public static readonly int TEXT_VISUAL_MULTI_LINE = NDalicPINVOKE.TEXT_VISUAL_MULTI_LINE_get(); - public static readonly int TEXT_VISUAL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_HORIZONTAL_ALIGNMENT_get(); - public static readonly int TEXT_VISUAL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_VERTICAL_ALIGNMENT_get(); - public static readonly int TEXT_VISUAL_TEXT_COLOR = NDalicPINVOKE.TEXT_VISUAL_TEXT_COLOR_get(); - public static readonly int TEXT_VISUAL_ENABLE_MARKUP = NDalicPINVOKE.TEXT_VISUAL_ENABLE_MARKUP_get(); - - public static readonly int TOOLTIP_CONTENT = NDalicPINVOKE.TOOLTIP_CONTENT_get(); - public static readonly int TOOLTIP_LAYOUT = NDalicPINVOKE.TOOLTIP_LAYOUT_get(); - public static readonly int TOOLTIP_WAIT_TIME = NDalicPINVOKE.TOOLTIP_WAIT_TIME_get(); - public static readonly int TOOLTIP_BACKGROUND = NDalicPINVOKE.TOOLTIP_BACKGROUND_get(); - public static readonly int TOOLTIP_TAIL = NDalicPINVOKE.TOOLTIP_TAIL_get(); - public static readonly int TOOLTIP_POSITION = NDalicPINVOKE.TOOLTIP_POSITION_get(); - public static readonly int TOOLTIP_HOVER_POINT_OFFSET = NDalicPINVOKE.TOOLTIP_HOVER_POINT_OFFSET_get(); - public static readonly int TOOLTIP_MOVEMENT_THRESHOLD = NDalicPINVOKE.TOOLTIP_MOVEMENT_THRESHOLD_get(); - public static readonly int TOOLTIP_DISAPPEAR_ON_MOVEMENT = NDalicPINVOKE.TOOLTIP_DISAPPEAR_ON_MOVEMENT_get(); - - public static readonly int TOOLTIP_BACKGROUND_VISUAL = NDalicPINVOKE.TOOLTIP_BACKGROUND_VISUAL_get(); - public static readonly int TOOLTIP_BACKGROUND_BORDER = NDalicPINVOKE.TOOLTIP_BACKGROUND_BORDER_get(); - - public static readonly int TOOLTIP_TAIL_VISIBILITY = NDalicPINVOKE.TOOLTIP_TAIL_VISIBILITY_get(); - public static readonly int TOOLTIP_TAIL_ABOVE_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_ABOVE_VISUAL_get(); - public static readonly int TOOLTIP_TAIL_BELOW_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_BELOW_VISUAL_get(); + internal static readonly int VISUAL_PROPERTY_TYPE = NDalicPINVOKE.VISUAL_PROPERTY_TYPE_get(); + internal static readonly int VISUAL_PROPERTY_SHADER = NDalicPINVOKE.VISUAL_PROPERTY_SHADER_get(); + + internal static readonly int VISUAL_SHADER_VERTEX = NDalicPINVOKE.VISUAL_SHADER_VERTEX_get(); + internal static readonly int VISUAL_SHADER_FRAGMENT = NDalicPINVOKE.VISUAL_SHADER_FRAGMENT_get(); + internal static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_X = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_X_get(); + internal static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_Y = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_Y_get(); + internal static readonly int VISUAL_SHADER_HINTS = NDalicPINVOKE.VISUAL_SHADER_HINTS_get(); + + internal static readonly int BORDER_VISUAL_COLOR = NDalicPINVOKE.BORDER_VISUAL_COLOR_get(); + internal static readonly int BORDER_VISUAL_SIZE = NDalicPINVOKE.BORDER_VISUAL_SIZE_get(); + internal static readonly int BORDER_VISUAL_ANTI_ALIASING = NDalicPINVOKE.BORDER_VISUAL_ANTI_ALIASING_get(); + + internal static readonly int COLOR_VISUAL_MIX_COLOR = NDalicPINVOKE.COLOR_VISUAL_MIX_COLOR_get(); + + internal static readonly int GRADIENT_VISUAL_START_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_START_POSITION_get(); + internal static readonly int GRADIENT_VISUAL_END_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_END_POSITION_get(); + internal static readonly int GRADIENT_VISUAL_CENTER = NDalicPINVOKE.GRADIENT_VISUAL_CENTER_get(); + internal static readonly int GRADIENT_VISUAL_RADIUS = NDalicPINVOKE.GRADIENT_VISUAL_RADIUS_get(); + internal static readonly int GRADIENT_VISUAL_STOP_OFFSET = NDalicPINVOKE.GRADIENT_VISUAL_STOP_OFFSET_get(); + internal static readonly int GRADIENT_VISUAL_STOP_COLOR = NDalicPINVOKE.GRADIENT_VISUAL_STOP_COLOR_get(); + internal static readonly int GRADIENT_VISUAL_UNITS = NDalicPINVOKE.GRADIENT_VISUAL_UNITS_get(); + internal static readonly int GRADIENT_VISUAL_SPREAD_METHOD = NDalicPINVOKE.GRADIENT_VISUAL_SPREAD_METHOD_get(); + + internal static readonly int IMAGE_VISUAL_URL = NDalicPINVOKE.IMAGE_VISUAL_URL_get(); + internal static readonly int IMAGE_VISUAL_FITTING_MODE = NDalicPINVOKE.IMAGE_VISUAL_FITTING_MODE_get(); + internal static readonly int IMAGE_VISUAL_SAMPLING_MODE = NDalicPINVOKE.IMAGE_VISUAL_SAMPLING_MODE_get(); + internal static readonly int IMAGE_VISUAL_DESIRED_WIDTH = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_WIDTH_get(); + internal static readonly int IMAGE_VISUAL_DESIRED_HEIGHT = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_HEIGHT_get(); + internal static readonly int IMAGE_VISUAL_SYNCHRONOUS_LOADING = NDalicPINVOKE.IMAGE_VISUAL_SYNCHRONOUS_LOADING_get(); + internal static readonly int IMAGE_VISUAL_BORDER_ONLY = NDalicPINVOKE.IMAGE_VISUAL_BORDER_ONLY_get(); + internal static readonly int IMAGE_VISUAL_PIXEL_AREA = NDalicPINVOKE.IMAGE_VISUAL_PIXEL_AREA_get(); + internal static readonly int IMAGE_VISUAL_WRAP_MODE_U = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_U_get(); + internal static readonly int IMAGE_VISUAL_WRAP_MODE_V = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_V_get(); + + internal static readonly int MESH_VISUAL_OBJECT_URL = NDalicPINVOKE.MESH_VISUAL_OBJECT_URL_get(); + internal static readonly int MESH_VISUAL_MATERIAL_URL = NDalicPINVOKE.MESH_VISUAL_MATERIAL_URL_get(); + internal static readonly int MESH_VISUAL_TEXTURES_PATH = NDalicPINVOKE.MESH_VISUAL_TEXTURES_PATH_get(); + internal static readonly int MESH_VISUAL_SHADING_MODE = NDalicPINVOKE.MESH_VISUAL_SHADING_MODE_get(); + internal static readonly int MESH_VISUAL_USE_MIPMAPPING = NDalicPINVOKE.MESH_VISUAL_USE_MIPMAPPING_get(); + internal static readonly int MESH_VISUAL_USE_SOFT_NORMALS = NDalicPINVOKE.MESH_VISUAL_USE_SOFT_NORMALS_get(); + internal static readonly int MESH_VISUAL_LIGHT_POSITION = NDalicPINVOKE.MESH_VISUAL_LIGHT_POSITION_get(); + + internal static readonly int PRIMITIVE_VISUAL_SHAPE = NDalicPINVOKE.PRIMITIVE_VISUAL_SHAPE_get(); + internal static readonly int PRIMITIVE_VISUAL_MIX_COLOR = NDalicPINVOKE.PRIMITIVE_VISUAL_MIX_COLOR_get(); + internal static readonly int PRIMITIVE_VISUAL_SLICES = NDalicPINVOKE.PRIMITIVE_VISUAL_SLICES_get(); + internal static readonly int PRIMITIVE_VISUAL_STACKS = NDalicPINVOKE.PRIMITIVE_VISUAL_STACKS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_TOP_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_HEIGHT = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_HEIGHT_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_RADIUS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_DIMENSIONS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_DIMENSIONS_get(); + internal static readonly int PRIMITIVE_VISUAL_BEVEL_PERCENTAGE = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE_get(); + internal static readonly int PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS_get(); + internal static readonly int PRIMITIVE_VISUAL_LIGHT_POSITION = NDalicPINVOKE.PRIMITIVE_VISUAL_LIGHT_POSITION_get(); + + internal static readonly int TEXT_VISUAL_TEXT = NDalicPINVOKE.TEXT_VISUAL_TEXT_get(); + internal static readonly int TEXT_VISUAL_FONT_FAMILY = NDalicPINVOKE.TEXT_VISUAL_FONT_FAMILY_get(); + internal static readonly int TEXT_VISUAL_FONT_STYLE = NDalicPINVOKE.TEXT_VISUAL_FONT_STYLE_get(); + internal static readonly int TEXT_VISUAL_POINT_SIZE = NDalicPINVOKE.TEXT_VISUAL_POINT_SIZE_get(); + internal static readonly int TEXT_VISUAL_MULTI_LINE = NDalicPINVOKE.TEXT_VISUAL_MULTI_LINE_get(); + internal static readonly int TEXT_VISUAL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_HORIZONTAL_ALIGNMENT_get(); + internal static readonly int TEXT_VISUAL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_VERTICAL_ALIGNMENT_get(); + internal static readonly int TEXT_VISUAL_TEXT_COLOR = NDalicPINVOKE.TEXT_VISUAL_TEXT_COLOR_get(); + internal static readonly int TEXT_VISUAL_ENABLE_MARKUP = NDalicPINVOKE.TEXT_VISUAL_ENABLE_MARKUP_get(); + + internal static readonly int TOOLTIP_CONTENT = NDalicPINVOKE.TOOLTIP_CONTENT_get(); + internal static readonly int TOOLTIP_LAYOUT = NDalicPINVOKE.TOOLTIP_LAYOUT_get(); + internal static readonly int TOOLTIP_WAIT_TIME = NDalicPINVOKE.TOOLTIP_WAIT_TIME_get(); + internal static readonly int TOOLTIP_BACKGROUND = NDalicPINVOKE.TOOLTIP_BACKGROUND_get(); + internal static readonly int TOOLTIP_TAIL = NDalicPINVOKE.TOOLTIP_TAIL_get(); + internal static readonly int TOOLTIP_POSITION = NDalicPINVOKE.TOOLTIP_POSITION_get(); + internal static readonly int TOOLTIP_HOVER_POINT_OFFSET = NDalicPINVOKE.TOOLTIP_HOVER_POINT_OFFSET_get(); + internal static readonly int TOOLTIP_MOVEMENT_THRESHOLD = NDalicPINVOKE.TOOLTIP_MOVEMENT_THRESHOLD_get(); + internal static readonly int TOOLTIP_DISAPPEAR_ON_MOVEMENT = NDalicPINVOKE.TOOLTIP_DISAPPEAR_ON_MOVEMENT_get(); + + internal static readonly int TOOLTIP_BACKGROUND_VISUAL = NDalicPINVOKE.TOOLTIP_BACKGROUND_VISUAL_get(); + internal static readonly int TOOLTIP_BACKGROUND_BORDER = NDalicPINVOKE.TOOLTIP_BACKGROUND_BORDER_get(); + + internal static readonly int TOOLTIP_TAIL_VISIBILITY = NDalicPINVOKE.TOOLTIP_TAIL_VISIBILITY_get(); + internal static readonly int TOOLTIP_TAIL_ABOVE_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_ABOVE_VISUAL_get(); + internal static readonly int TOOLTIP_TAIL_BELOW_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_BELOW_VISUAL_get(); } diff --git a/plugins/dali-sharp/sharp/internal/NDalicPINVOKE.cs b/plugins/dali-sharp/sharp/internal/NDalicPINVOKE.cs index 08a7dfd..ead990a 100644 --- a/plugins/dali-sharp/sharp/internal/NDalicPINVOKE.cs +++ b/plugins/dali-sharp/sharp/internal/NDalicPINVOKE.cs @@ -1659,13 +1659,13 @@ class NDalicPINVOKE { public static extern int Property_Value_GetType(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_1")] - public static extern bool Property_Value_Get__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, ref bool jarg2); + public static extern bool Property_Value_Get__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, out bool jarg2); [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_2")] - public static extern bool Property_Value_Get__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, ref float jarg2); + public static extern bool Property_Value_Get__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, out float jarg2); [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_3")] - public static extern bool Property_Value_Get__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, ref int jarg2); + public static extern bool Property_Value_Get__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, out int jarg2); [global::System.Runtime.InteropServices.DllImport("NDalic", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_4")] public static extern bool Property_Value_Get__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/plugins/dali-sharp/sharp/internal/NativeImage.cs b/plugins/dali-sharp/sharp/internal/NativeImage.cs index 26ad622..01af5cb 100644 --- a/plugins/dali-sharp/sharp/internal/NativeImage.cs +++ b/plugins/dali-sharp/sharp/internal/NativeImage.cs @@ -26,7 +26,7 @@ namespace Dali { -public class NativeImage : Image { +internal class NativeImage : Image { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal NativeImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NativeImage_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/NativeImageInterface.cs b/plugins/dali-sharp/sharp/internal/NativeImageInterface.cs index 208330f..4e48b14 100644 --- a/plugins/dali-sharp/sharp/internal/NativeImageInterface.cs +++ b/plugins/dali-sharp/sharp/internal/NativeImageInterface.cs @@ -10,7 +10,7 @@ namespace Dali { -public class NativeImageInterface : RefObject { +internal class NativeImageInterface : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal NativeImageInterface(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NativeImageInterface_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/NinePatchImage.cs b/plugins/dali-sharp/sharp/internal/NinePatchImage.cs index 1843d43..70c4199 100644 --- a/plugins/dali-sharp/sharp/internal/NinePatchImage.cs +++ b/plugins/dali-sharp/sharp/internal/NinePatchImage.cs @@ -26,7 +26,7 @@ namespace Dali { -public class NinePatchImage : ResourceImage { +internal class NinePatchImage : ResourceImage { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal NinePatchImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.NinePatchImage_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/Object.cs b/plugins/dali-sharp/sharp/internal/Object.cs index 1cefaa4..cf3e7c1 100644 --- a/plugins/dali-sharp/sharp/internal/Object.cs +++ b/plugins/dali-sharp/sharp/internal/Object.cs @@ -22,7 +22,7 @@ namespace Dali { -public static class Object +internal static class Object { public static Property.Value GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) { Property.Value ret = new Property.Value(NDalicPINVOKE.Handle_GetProperty(handle, index), true); diff --git a/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs b/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs index d8eee47..cd84c20 100644 --- a/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ObjectCreatedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ObjectCreatedSignal : global::System.IDisposable { +internal class ObjectCreatedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs b/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs index 1437c55..cde9738 100644 --- a/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ObjectDestroyedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ObjectDestroyedSignal : global::System.IDisposable { +internal class ObjectDestroyedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs b/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs index 8342997..732fcbb 100644 --- a/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs +++ b/plugins/dali-sharp/sharp/internal/ObjectRegistry.cs @@ -14,7 +14,7 @@ using System; using System.Runtime.InteropServices; -public class ObjectRegistry : BaseHandle { +internal class ObjectRegistry : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ObjectRegistry(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ObjectRegistry_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PageFactory.cs b/plugins/dali-sharp/sharp/internal/PageFactory.cs index 03b4384..fd581bd 100644 --- a/plugins/dali-sharp/sharp/internal/PageFactory.cs +++ b/plugins/dali-sharp/sharp/internal/PageFactory.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PageFactory : global::System.IDisposable { +internal class PageFactory : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PagePanSignal.cs b/plugins/dali-sharp/sharp/internal/PagePanSignal.cs index 832c237..c9cbdb9 100644 --- a/plugins/dali-sharp/sharp/internal/PagePanSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PagePanSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PagePanSignal : global::System.IDisposable { +internal class PagePanSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs b/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs index 70b69c2..fa57448 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnLandscapeView.cs @@ -26,7 +26,7 @@ namespace Dali { -public class PageTurnLandscapeView : PageTurnView { +internal class PageTurnLandscapeView : PageTurnView { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PageTurnLandscapeView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnLandscapeView_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs b/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs index b27c84a..fb4a257 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnPortraitView.cs @@ -26,7 +26,7 @@ namespace Dali { -public class PageTurnPortraitView : PageTurnView { +internal class PageTurnPortraitView : PageTurnView { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PageTurnPortraitView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnPortraitView_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs b/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs index d4bb117..b396762 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PageTurnSignal : global::System.IDisposable { +internal class PageTurnSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PageTurnView.cs b/plugins/dali-sharp/sharp/internal/PageTurnView.cs index c8f003d..e6e7957 100644 --- a/plugins/dali-sharp/sharp/internal/PageTurnView.cs +++ b/plugins/dali-sharp/sharp/internal/PageTurnView.cs @@ -14,7 +14,7 @@ using System; using System.Runtime.InteropServices; -public class PageTurnView : View { +internal class PageTurnView : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PageTurnView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnView_SWIGUpcast(cPtr), cMemoryOwn) { @@ -475,11 +475,6 @@ public class PageTurnFinishedEventArgs : EventArgs return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public Vector2 PageSize { get @@ -498,7 +493,7 @@ public class PageTurnFinishedEventArgs : EventArgs get { int temp = 0; - GetProperty( PageTurnView.Property.CURRENT_PAGE_ID).Get( ref temp ); + GetProperty( PageTurnView.Property.CURRENT_PAGE_ID).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs index 17894b5..df266e8 100644 --- a/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PanGestureDetectedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PanGestureDetectedSignal : global::System.IDisposable { +internal class PanGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs index 0d7b557..5829a01 100644 --- a/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/PanGestureDetector.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -public class PanGestureDetector : GestureDetector { +internal class PanGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PanGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PanGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) { @@ -333,7 +333,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int return ret; } - public AngleThresholdPair GetAngle(uint index) { + internal AngleThresholdPair GetAngle(uint index) { AngleThresholdPair ret = new AngleThresholdPair(NDalicPINVOKE.PanGestureDetector_GetAngle(swigCPtr, index), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -418,7 +418,7 @@ public static PanGestureDetector GetPanGestureDetectorFromPtr(global::System.Int get { bool temp = false; - Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.PANNING).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, PanGestureDetector.Property.PANNING).Get( out temp ); return temp; } } diff --git a/plugins/dali-sharp/sharp/internal/PathConstrainer.cs b/plugins/dali-sharp/sharp/internal/PathConstrainer.cs index 2b9cc6a..0077d78 100644 --- a/plugins/dali-sharp/sharp/internal/PathConstrainer.cs +++ b/plugins/dali-sharp/sharp/internal/PathConstrainer.cs @@ -26,7 +26,7 @@ namespace Dali { -public class PathConstrainer : BaseHandle { +internal class PathConstrainer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PathConstrainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PathConstrainer_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs index 7499af5..79caa97 100644 --- a/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PinchGestureDetectedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PinchGestureDetectedSignal : global::System.IDisposable { +internal class PinchGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs b/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs index 7467e62..6305a3b 100644 --- a/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/PinchGestureDetector.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -public class PinchGestureDetector : GestureDetector { +internal class PinchGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PinchGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PinchGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PixelData.cs b/plugins/dali-sharp/sharp/internal/PixelData.cs index 488919c..3457291 100644 --- a/plugins/dali-sharp/sharp/internal/PixelData.cs +++ b/plugins/dali-sharp/sharp/internal/PixelData.cs @@ -26,7 +26,7 @@ namespace Dali { -public class PixelData : BaseHandle { +internal class PixelData : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PixelData(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PixelData_SWIGUpcast(cPtr), cMemoryOwn) { @@ -65,15 +65,6 @@ public class PixelData : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PixelData(PixelData handle) : this(NDalicPINVOKE.new_PixelData__SWIG_1(PixelData.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PixelData Assign(PixelData rhs) { - PixelData ret = new PixelData(NDalicPINVOKE.PixelData_Assign(swigCPtr, PixelData.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public uint GetWidth() { uint ret = NDalicPINVOKE.PixelData_GetWidth(swigCPtr); diff --git a/plugins/dali-sharp/sharp/internal/PixelFormat.cs b/plugins/dali-sharp/sharp/internal/PixelFormat.cs index 9d1e5ec..283880b 100644 --- a/plugins/dali-sharp/sharp/internal/PixelFormat.cs +++ b/plugins/dali-sharp/sharp/internal/PixelFormat.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum PixelFormat { +internal enum PixelFormat { INVALID = 0, A8 = 1, L8, diff --git a/plugins/dali-sharp/sharp/internal/PositionInheritanceMode.cs b/plugins/dali-sharp/sharp/internal/PositionInheritanceMode.cs deleted file mode 100644 index 1d7c39f..0000000 --- a/plugins/dali-sharp/sharp/internal/PositionInheritanceMode.cs +++ /dev/null @@ -1,20 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum PositionInheritanceMode { - INHERIT_PARENT_POSITION, - USE_PARENT_POSITION, - USE_PARENT_POSITION_PLUS_LOCAL_POSITION, - DONT_INHERIT_POSITION -} - -} diff --git a/plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs b/plugins/dali-sharp/sharp/internal/PreFocusChangeSignal.cs similarity index 94% rename from plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs rename to plugins/dali-sharp/sharp/internal/PreFocusChangeSignal.cs index 4ef8cd6..c305bbc 100755 --- a/plugins/dali-sharp/sharp/internal/KeyboardPreFocusChangeSignal.cs +++ b/plugins/dali-sharp/sharp/internal/PreFocusChangeSignal.cs @@ -19,9 +19,9 @@ using System; namespace Dali { -public delegate IntPtr SwigDelegatePreFocusChangeSignal(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction); +public delegate IntPtr SwigDelegatePreFocusChangeSignal(IntPtr current, IntPtr proposed, View.Focus.Direction direction); -public class PreFocusChangeSignal : global::System.IDisposable { +internal class PreFocusChangeSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -81,7 +81,7 @@ public class PreFocusChangeSignal : global::System.IDisposable { } } - public View Emit(View arg1, View arg2, View.KeyboardFocus.Direction arg3) { + public View Emit(View arg1, View arg2, View.Focus.Direction arg3) { View ret = new View(NDalicManualPINVOKE.PreFocusChangeSignal_Emit(swigCPtr, View.getCPtr(arg1), View.getCPtr(arg2), (int)arg3), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/PrimitiveVisualShapeType.cs b/plugins/dali-sharp/sharp/internal/PrimitiveVisualShapeType.cs deleted file mode 100644 index eedb5c8..0000000 --- a/plugins/dali-sharp/sharp/internal/PrimitiveVisualShapeType.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum PrimitiveVisualShapeType { - SPHERE, - CONICAL_FRUSTRUM, - CONE, - CYLINDER, - CUBE, - OCTAHEDRON, - BEVELLED_CUBE -} - -} diff --git a/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs b/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs index 08fb49b..e143d50 100644 --- a/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ProgressBarValueChangedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ProgressBarValueChangedSignal : global::System.IDisposable { +internal class ProgressBarValueChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ProjectionMode.cs b/plugins/dali-sharp/sharp/internal/ProjectionMode.cs index ed7062a..5d994ba 100644 --- a/plugins/dali-sharp/sharp/internal/ProjectionMode.cs +++ b/plugins/dali-sharp/sharp/internal/ProjectionMode.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum ProjectionMode { +internal enum ProjectionMode { PERSPECTIVE_PROJECTION, ORTHOGRAPHIC_PROJECTION } diff --git a/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs b/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs index dc75cb6..cc9fd7d 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyBuffer.cs @@ -26,7 +26,7 @@ namespace Dali { -public class PropertyBuffer : BaseHandle { +internal class PropertyBuffer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PropertyBuffer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyBuffer_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PropertyCondition.cs b/plugins/dali-sharp/sharp/internal/PropertyCondition.cs index 65abe14..7e2a684 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyCondition.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyCondition.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PropertyCondition : BaseHandle { +internal class PropertyCondition : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PropertyCondition(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyCondition_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PropertyNotification.cs b/plugins/dali-sharp/sharp/internal/PropertyNotification.cs index d1f1048..4333903 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyNotification.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyNotification.cs @@ -14,7 +14,7 @@ using System; using System.Runtime.InteropServices; -public class PropertyNotification : BaseHandle { +internal class PropertyNotification : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal PropertyNotification(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PropertyNotification_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs b/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs index f253371..09e6587 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyNotifySignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PropertyNotifySignal : global::System.IDisposable { +internal class PropertyNotifySignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PropertyRangeManager.cs b/plugins/dali-sharp/sharp/internal/PropertyRangeManager.cs index 7e6c4d4..a63b177 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyRangeManager.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyRangeManager.cs @@ -7,7 +7,7 @@ namespace Dali /// /// Helper class for calculating what property indexes should be assigned to C# View (view) classes. /// - public class PropertyRangeManager + internal class PropertyRangeManager { private Dictionary _propertyRange; diff --git a/plugins/dali-sharp/sharp/internal/PropertyRanges.cs b/plugins/dali-sharp/sharp/internal/PropertyRanges.cs index f8134e6..83d622d 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyRanges.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyRanges.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum PropertyRanges { +internal enum PropertyRanges { DEFAULT_OBJECT_PROPERTY_START_INDEX = 0, DEFAULT_ACTOR_PROPERTY_START_INDEX = DEFAULT_OBJECT_PROPERTY_START_INDEX, DEFAULT_ACTOR_PROPERTY_MAX_COUNT = 10000, diff --git a/plugins/dali-sharp/sharp/internal/PropertyRegistration.cs b/plugins/dali-sharp/sharp/internal/PropertyRegistration.cs index 4b04bb8..41cc627 100644 --- a/plugins/dali-sharp/sharp/internal/PropertyRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/PropertyRegistration.cs @@ -10,7 +10,7 @@ namespace Dali { -public class PropertyRegistration : global::System.IDisposable { +internal class PropertyRegistration : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/PushButton.cs b/plugins/dali-sharp/sharp/internal/PushButton.cs deleted file mode 100644 index 5bc4f1f..0000000 --- a/plugins/dali-sharp/sharp/internal/PushButton.cs +++ /dev/null @@ -1,244 +0,0 @@ -/** Copyright (c) 2017 Samsung Electronics Co., Ltd. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ -// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public class PushButton : Button { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - - internal PushButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PushButton_SWIGUpcast(cPtr), cMemoryOwn) { - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PushButton obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~PushButton() { - DisposeQueue.Instance.Add(this); - } - - public override void Dispose() { - if (!Window.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_PushButton(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - base.Dispose(); - } - } - - - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_PushButton_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_PushButton_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get(); - public static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get(); - public static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get(); - public static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get(); - public static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get(); - - } - - public PushButton () : this (NDalicPINVOKE.PushButton_New(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - - } - public PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PushButton Assign(PushButton pushButton) { - PushButton ret = new PushButton(NDalicPINVOKE.PushButton_Assign(swigCPtr, PushButton.getCPtr(pushButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static PushButton DownCast(BaseHandle handle) { - PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new void SetButtonImage(Image image) { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_0_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetButtonImage(View image) { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetBackgroundImage(View image) { - NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public new void SetSelectedImage(Image image) { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_0_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetSelectedImage(View image) { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetSelectedBackgroundImage(View image) { - NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetDisabledBackgroundImage(View image) { - NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetDisabledImage(View image) { - NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetDisabledSelectedImage(View image) { - NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - - public string UnselectedIcon - { - get - { - string temp; - GetProperty( PushButton.Property.UNSELECTED_ICON).Get( out temp ); - return temp; - } - set - { - SetProperty( PushButton.Property.UNSELECTED_ICON, new Dali.Property.Value( value ) ); - } - } - public string SelectedIcon - { - get - { - string temp; - GetProperty( PushButton.Property.SELECTED_ICON).Get( out temp ); - return temp; - } - set - { - SetProperty( PushButton.Property.SELECTED_ICON, new Dali.Property.Value( value ) ); - } - } - public string IconAlignment - { - get - { - string temp; - GetProperty( PushButton.Property.ICON_ALIGNMENT).Get( out temp ); - return temp; - } - set - { - SetProperty( PushButton.Property.ICON_ALIGNMENT, new Dali.Property.Value( value ) ); - } - } - public string LabelPadding - { - get - { - string temp; - GetProperty( PushButton.Property.LABEL_PADDING).Get( out temp ); - return temp; - } - set - { - SetProperty( PushButton.Property.LABEL_PADDING, new Dali.Property.Value( value ) ); - } - } - public string IconPadding - { - get - { - string temp; - GetProperty( PushButton.Property.ICON_PADDING).Get( out temp ); - return temp; - } - set - { - SetProperty( PushButton.Property.ICON_PADDING, new Dali.Property.Value( value ) ); - } - } - -} - -} diff --git a/plugins/dali-sharp/sharp/internal/RefObject.cs b/plugins/dali-sharp/sharp/internal/RefObject.cs index 7764d68..47f2ce0 100644 --- a/plugins/dali-sharp/sharp/internal/RefObject.cs +++ b/plugins/dali-sharp/sharp/internal/RefObject.cs @@ -10,7 +10,7 @@ namespace Dali { -public class RefObject : global::System.IDisposable { +internal class RefObject : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/RenderTask.cs b/plugins/dali-sharp/sharp/internal/RenderTask.cs index e16deed..925f2c5 100644 --- a/plugins/dali-sharp/sharp/internal/RenderTask.cs +++ b/plugins/dali-sharp/sharp/internal/RenderTask.cs @@ -10,7 +10,7 @@ namespace Dali { -public class RenderTask : Animatable { +internal class RenderTask : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal RenderTask(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTask_SWIGUpcast(cPtr), cMemoryOwn) { @@ -92,7 +92,7 @@ public class RenderTask : Animatable { } - public static SWIGTYPE_p_f_r_Dali__Vector2__bool DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION { + internal static SWIGTYPE_p_f_r_Dali__Vector2__bool DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION { get { global::System.IntPtr cPtr = NDalicPINVOKE.RenderTask_DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION_get(); SWIGTYPE_p_f_r_Dali__Vector2__bool ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_r_Dali__Vector2__bool(cPtr, false); @@ -101,7 +101,7 @@ public class RenderTask : Animatable { } } - public static SWIGTYPE_p_f_r_Dali__Vector2__bool FULLSCREEN_FRAMEBUFFER_FUNCTION { + internal static SWIGTYPE_p_f_r_Dali__Vector2__bool FULLSCREEN_FRAMEBUFFER_FUNCTION { get { global::System.IntPtr cPtr = NDalicPINVOKE.RenderTask_FULLSCREEN_FRAMEBUFFER_FUNCTION_get(); SWIGTYPE_p_f_r_Dali__Vector2__bool ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_r_Dali__Vector2__bool(cPtr, false); @@ -212,12 +212,12 @@ public class RenderTask : Animatable { return ret; } - public void SetCamera(Camera camera) { + internal void SetCamera(Camera camera) { NDalicPINVOKE.RenderTask_SetCameraActor(swigCPtr, Camera.getCPtr(camera)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Camera GetCamera() { + internal Camera GetCamera() { Camera ret = new Camera(NDalicPINVOKE.RenderTask_GetCameraActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -245,12 +245,12 @@ public class RenderTask : Animatable { return ret; } - public void SetScreenToFrameBufferFunction(SWIGTYPE_p_f_r_Dali__Vector2__bool conversionFunction) { + internal void SetScreenToFrameBufferFunction(SWIGTYPE_p_f_r_Dali__Vector2__bool conversionFunction) { NDalicPINVOKE.RenderTask_SetScreenToFrameBufferFunction(swigCPtr, SWIGTYPE_p_f_r_Dali__Vector2__bool.getCPtr(conversionFunction)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_f_r_Dali__Vector2__bool GetScreenToFrameBufferFunction() { + internal SWIGTYPE_p_f_r_Dali__Vector2__bool GetScreenToFrameBufferFunction() { global::System.IntPtr cPtr = NDalicPINVOKE.RenderTask_GetScreenToFrameBufferFunction(swigCPtr); SWIGTYPE_p_f_r_Dali__Vector2__bool ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_r_Dali__Vector2__bool(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -357,7 +357,7 @@ public class RenderTask : Animatable { return ret; } - public RenderTaskSignal FinishedSignal() { + internal RenderTaskSignal FinishedSignal() { RenderTaskSignal ret = new RenderTaskSignal(NDalicPINVOKE.RenderTask_FinishedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -412,7 +412,7 @@ public class RenderTask : Animatable { get { bool temp = false; - GetProperty( RenderTask.Property.REQUIRES_SYNC).Get( ref temp ); + GetProperty( RenderTask.Property.REQUIRES_SYNC).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/RenderTaskList.cs b/plugins/dali-sharp/sharp/internal/RenderTaskList.cs index e5a5585..55201fd 100644 --- a/plugins/dali-sharp/sharp/internal/RenderTaskList.cs +++ b/plugins/dali-sharp/sharp/internal/RenderTaskList.cs @@ -10,7 +10,7 @@ namespace Dali { -public class RenderTaskList : BaseHandle { +internal class RenderTaskList : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal RenderTaskList(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.RenderTaskList_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs b/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs index 88903f3..ae3f02d 100644 --- a/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs +++ b/plugins/dali-sharp/sharp/internal/RenderTaskSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class RenderTaskSignal : global::System.IDisposable { +internal class RenderTaskSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Renderer.cs b/plugins/dali-sharp/sharp/internal/Renderer.cs index f5cd740..0e48a89 100644 --- a/plugins/dali-sharp/sharp/internal/Renderer.cs +++ b/plugins/dali-sharp/sharp/internal/Renderer.cs @@ -26,7 +26,7 @@ namespace Dali { -public class Renderer : Animatable { +internal class Renderer : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Renderer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Renderer_SWIGUpcast(cPtr), cMemoryOwn) { @@ -185,7 +185,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_INDEX).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_INDEX).Get( out temp ); return temp; } set @@ -198,7 +198,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.FACE_CULLING_MODE).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.FACE_CULLING_MODE).Get( out temp ); return temp; } set @@ -211,7 +211,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_MODE).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_MODE).Get( out temp ); return temp; } set @@ -224,7 +224,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_RGB).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_RGB).Get( out temp ); return temp; } set @@ -237,7 +237,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA).Get( out temp ); return temp; } set @@ -250,7 +250,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB).Get( out temp ); return temp; } set @@ -263,7 +263,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB).Get( out temp ); return temp; } set @@ -276,7 +276,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get( out temp ); return temp; } set @@ -289,7 +289,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get( out temp ); return temp; } set @@ -315,7 +315,7 @@ public class Renderer : Animatable { get { bool temp = false; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get( out temp ); return temp; } set @@ -328,7 +328,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_FIRST).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_FIRST).Get( out temp ); return temp; } set @@ -341,7 +341,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_COUNT).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.INDEX_RANGE_COUNT).Get( out temp ); return temp; } set @@ -354,7 +354,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_WRITE_MODE).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_WRITE_MODE).Get( out temp ); return temp; } set @@ -367,7 +367,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_FUNCTION).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_FUNCTION).Get( out temp ); return temp; } set @@ -380,7 +380,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_TEST_MODE).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.DEPTH_TEST_MODE).Get( out temp ); return temp; } set @@ -393,7 +393,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.RENDER_MODE).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.RENDER_MODE).Get( out temp ); return temp; } set @@ -406,7 +406,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION).Get( out temp ); return temp; } set @@ -419,7 +419,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK).Get( out temp ); return temp; } set @@ -432,7 +432,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get( out temp ); return temp; } set @@ -445,7 +445,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_MASK).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_MASK).Get( out temp ); return temp; } set @@ -458,7 +458,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get( out temp ); return temp; } set @@ -471,7 +471,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get( out temp ); return temp; } set @@ -484,7 +484,7 @@ public class Renderer : Animatable { get { int temp = 0; - Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( ref temp ); + Dali.Object.GetProperty( swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/RenderingType.cs b/plugins/dali-sharp/sharp/internal/RenderingType.cs index e232637..1ebf01d 100644 --- a/plugins/dali-sharp/sharp/internal/RenderingType.cs +++ b/plugins/dali-sharp/sharp/internal/RenderingType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum RenderingType { +internal enum RenderingType { RENDERING_SHARED_ATLAS, RENDERING_VECTOR_BASED } diff --git a/plugins/dali-sharp/sharp/internal/ResourceImage.cs b/plugins/dali-sharp/sharp/internal/ResourceImage.cs index 945537c..372a153 100644 --- a/plugins/dali-sharp/sharp/internal/ResourceImage.cs +++ b/plugins/dali-sharp/sharp/internal/ResourceImage.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -public class ResourceImage : Image { +internal class ResourceImage : Image { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ResourceImage(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ResourceImage_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs b/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs index 58b1bfe..aa8b13d 100644 --- a/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ResourceImageSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ResourceImageSignal : global::System.IDisposable { +internal class ResourceImageSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Ruler.cs b/plugins/dali-sharp/sharp/internal/Ruler.cs index 6cde751..56616d1 100644 --- a/plugins/dali-sharp/sharp/internal/Ruler.cs +++ b/plugins/dali-sharp/sharp/internal/Ruler.cs @@ -10,7 +10,7 @@ namespace Dali { -public class Ruler : RefObject { +internal class Ruler : RefObject { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Ruler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Ruler_SWIGUpcast(cPtr), cMemoryOwn) { @@ -121,7 +121,7 @@ public class Ruler : RefObject { return ret; } - public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.Ruler_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -151,7 +151,7 @@ public class Ruler : RefObject { return ret; } - public float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.Ruler_SnapAndClamp__SWIG_4(swigCPtr, x, bias, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/RulerDomain.cs b/plugins/dali-sharp/sharp/internal/RulerDomain.cs index 74116f0..727b67f 100644 --- a/plugins/dali-sharp/sharp/internal/RulerDomain.cs +++ b/plugins/dali-sharp/sharp/internal/RulerDomain.cs @@ -10,7 +10,7 @@ namespace Dali { -public class RulerDomain : global::System.IDisposable { +internal class RulerDomain : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -48,7 +48,7 @@ public class RulerDomain : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float min { + public float Min { set { NDalicPINVOKE.RulerDomain_min_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -60,7 +60,7 @@ public class RulerDomain : global::System.IDisposable { } } - public float max { + public float Max { set { NDalicPINVOKE.RulerDomain_max_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -72,7 +72,7 @@ public class RulerDomain : global::System.IDisposable { } } - public bool enabled { + public bool Enabled { set { NDalicPINVOKE.RulerDomain_enabled_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -102,7 +102,7 @@ public class RulerDomain : global::System.IDisposable { return ret; } - public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.RulerDomain_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/RulerPtr.cs b/plugins/dali-sharp/sharp/internal/RulerPtr.cs index 34ae3a8..7a4108e 100644 --- a/plugins/dali-sharp/sharp/internal/RulerPtr.cs +++ b/plugins/dali-sharp/sharp/internal/RulerPtr.cs @@ -10,7 +10,7 @@ namespace Dali { -public class RulerPtr : global::System.IDisposable { +internal class RulerPtr : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -193,7 +193,7 @@ public class RulerPtr : global::System.IDisposable { return ret; } - public float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float Clamp(float x, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.RulerPtr_Clamp__SWIG_3(swigCPtr, x, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -223,7 +223,7 @@ public class RulerPtr : global::System.IDisposable { return ret; } - public float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { + internal float SnapAndClamp(float x, float bias, float length, float scale, SWIGTYPE_p_Dali__Toolkit__ClampState clamped) { float ret = NDalicPINVOKE.RulerPtr_SnapAndClamp__SWIG_4(swigCPtr, x, bias, length, scale, SWIGTYPE_p_Dali__Toolkit__ClampState.getCPtr(clamped)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_CallbackBase.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_CallbackBase.cs index d0de4ed..350254a 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_CallbackBase.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_CallbackBase.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_CallbackBase { +internal class SWIGTYPE_p_CallbackBase { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_CallbackBase(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Configuration__ContextLoss.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Configuration__ContextLoss.cs index 83f64f2..959b636 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Configuration__ContextLoss.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Configuration__ContextLoss.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Configuration__ContextLoss { +internal class SWIGTYPE_p_Configuration__ContextLoss { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Configuration__ContextLoss(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CallbackBase.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CallbackBase.cs index 2f102cf..966f032 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CallbackBase.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CallbackBase.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__CallbackBase { +internal class SWIGTYPE_p_Dali__CallbackBase { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__CallbackBase(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Constraint.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Constraint.cs index 7aa48de..63ebdc7 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Constraint.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Constraint.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Constraint { +internal class SWIGTYPE_p_Dali__Constraint { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Constraint(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs index beed87e..2c23595 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__CustomActorImpl__Extension.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__CustomActorImpl__Extension { +internal class SWIGTYPE_p_Dali__CustomActorImpl__Extension { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__CustomActorImpl__Extension(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs index f72bab9..9a2f5ae 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__FunctorDelegate.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__FunctorDelegate { +internal class SWIGTYPE_p_Dali__FunctorDelegate { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__FunctorDelegate(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__Texture.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__Texture.cs index 20c413a..d6ab6ea 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__Texture.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__Texture.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Internal__Texture { +internal class SWIGTYPE_p_Dali__Internal__Texture { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Internal__Texture(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs index 9b01617..88e43b9 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Internal__TypeRegistry.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Internal__TypeRegistry { +internal class SWIGTYPE_p_Dali__Internal__TypeRegistry { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Internal__TypeRegistry(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs index 4a8de77..3512d0e 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t { +internal class SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs index e37b56a..37dcacf 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__RectT_unsigned_int_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__RectT_unsigned_int_t { +internal class SWIGTYPE_p_Dali__RectT_unsigned_int_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__RectT_unsigned_int_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs index 2be4391..2781254 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t { +internal class SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Actor_Dali__TouchEvent_const_RF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs index b4b460a..f891ed2 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t { +internal class SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_bool_fDali__Toolkit__AccessibilityManager_R_Dali__TouchEvent_const_RF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs index 09ae13c..0728e71 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t { +internal class SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_void_fDali__DragAndDropDetectorF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs index e9cae81..7d841a9 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t { +internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs index 5aa4d31..b043730 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t { +internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs index 89d4794..5f4acaa 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t { +internal class SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs index 546bd3e..65e416b 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t { +internal class SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__SignalT_void_fuint32_t_Dali__PixelDataF_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs index ec0f81f..c496dd3 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ClampState.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Toolkit__ClampState { +internal class SWIGTYPE_p_Dali__Toolkit__ClampState { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Toolkit__ClampState(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs index 74fe7c3..9612f5f 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader { +internal class SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Toolkit__Internal__AsyncImageLoader(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs index 5862b96..791efd1 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension { +internal class SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Toolkit__Internal__Control__Extension(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs index 4cbdab7..1b36c4c 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData { +internal class SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs index 1b6f85f..90a5b6d 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base { +internal class SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs index 7da7fff..b1edbe5 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension { +internal class SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__Toolkit__ItemFactory__Extension(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__TouchEvent.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__TouchEvent.cs index e82a68d..aacb487 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__TouchEvent.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_Dali__TouchEvent.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_Dali__TouchEvent { +internal class SWIGTYPE_p_Dali__TouchEvent { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_Dali__TouchEvent(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_FunctorDelegate.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_FunctorDelegate.cs index c5d171e..c73fef4 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_FunctorDelegate.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_FunctorDelegate.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_FunctorDelegate { +internal class SWIGTYPE_p_FunctorDelegate { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_FunctorDelegate(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_KeyboardFocusManager.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_KeyboardFocusManager.cs index e8cb60b..f7d1378 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_KeyboardFocusManager.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_KeyboardFocusManager.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_KeyboardFocusManager { +internal class SWIGTYPE_p_KeyboardFocusManager { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_KeyboardFocusManager(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_PropertyInputContainer.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_PropertyInputContainer.cs index 13d5ff0..f01e1df 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_PropertyInputContainer.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_PropertyInputContainer.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_PropertyInputContainer { +internal class SWIGTYPE_p_PropertyInputContainer { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_PropertyInputContainer(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_double.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_double.cs index 0d05593..4202845 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_double.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_double.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_double { +internal class SWIGTYPE_p_double { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_double(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_float__float.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_float__float.cs index 1bbe272..e352fdb 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_float__float.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_float__float.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_float__float { +internal class SWIGTYPE_p_f_float__float { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_float__float(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs index d0c5705..1ffc729 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value { +internal class SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_p_Dali__BaseObject_Dali__Property__Index__Dali__Property__Value(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs index f356055..1f0e367 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void { +internal class SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_p_Dali__BaseObject_int_r_q_const__Dali__Property__Value__void(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs index 0a06df9..df40d68 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool { +internal class SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_p_Dali__BaseObject_p_Dali__ConnectionTrackerInterface_r_q_const__std__string_p_Dali__FunctorDelegate__bool(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs index 8e05bfb..8f94a57 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool { +internal class SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs index 079a50e..84d8aa5 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void { +internal class SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_p_q_const__Dali__Any__AnyContainerBase__void(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs index 0b879fa..1dfd9d0 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_Dali__Vector2__bool.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_r_Dali__Vector2__bool { +internal class SWIGTYPE_p_f_r_Dali__Vector2__bool { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_r_Dali__Vector2__bool(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs index ede2e8f..f8f1983 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase { +internal class SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_r_q_const__Dali__Any__AnyContainerBase__p_Dali__Any__AnyContainerBase(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs index 3692c7b..dc51634 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_f_r_q_const__Dali__Vector3__float { +internal class SWIGTYPE_p_f_r_q_const__Dali__Vector3__float { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_f_r_q_const__Dali__Vector3__float(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_float.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_float.cs index a6663a2..6f781fe 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_float.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_float.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_float { +internal class SWIGTYPE_p_float { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_float(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_int.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_int.cs index a80c225..d78501c 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_int.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_int.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_int { +internal class SWIGTYPE_p_int { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_int(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_std__type_info.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_std__type_info.cs index 5abbdba..106f3d7 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_std__type_info.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_std__type_info.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_std__type_info { +internal class SWIGTYPE_p_std__type_info { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_std__type_info(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_uint8_t.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_uint8_t.cs index 06f3490..fdd4af9 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_uint8_t.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_uint8_t.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_uint8_t { +internal class SWIGTYPE_p_uint8_t { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_uint8_t(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_char.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_char.cs index fe18cfe..ad5078a 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_char.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_char.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_unsigned_char { +internal class SWIGTYPE_p_unsigned_char { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_unsigned_char(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_int.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_int.cs index 64f389a..ba5c1c0 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_int.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_int.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_unsigned_int { +internal class SWIGTYPE_p_unsigned_int { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_unsigned_int(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_short.cs b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_short.cs index 0f916ad..8e69064 100644 --- a/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_short.cs +++ b/plugins/dali-sharp/sharp/internal/SWIGTYPE_p_unsigned_short.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SWIGTYPE_p_unsigned_short { +internal class SWIGTYPE_p_unsigned_short { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal SWIGTYPE_p_unsigned_short(global::System.IntPtr cPtr, bool futureUse) { diff --git a/plugins/dali-sharp/sharp/internal/Sampler.cs b/plugins/dali-sharp/sharp/internal/Sampler.cs index 4ca9f65..bd40fa1 100644 --- a/plugins/dali-sharp/sharp/internal/Sampler.cs +++ b/plugins/dali-sharp/sharp/internal/Sampler.cs @@ -26,7 +26,7 @@ namespace Dali { -public class Sampler : BaseHandle { +internal class Sampler : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Sampler(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Sampler_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs b/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs index 2cd59d7..209177f 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollViewPagePathEffect.cs @@ -26,7 +26,7 @@ namespace Dali { -public class ScrollViewPagePathEffect : ScrollViewEffect { +internal class ScrollViewPagePathEffect : ScrollViewEffect { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ScrollViewPagePathEffect(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollViewPagePathEffect_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs b/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs index 6074898..c48d546 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollViewSnapStartedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ScrollViewSnapStartedSignal : global::System.IDisposable { +internal class ScrollViewSnapStartedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs b/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs index d4ef47f..58c80d2 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ScrollableSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ScrollableSignal : global::System.IDisposable { +internal class ScrollableSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Shader.cs b/plugins/dali-sharp/sharp/internal/Shader.cs index d17e399..4ba3c5f 100644 --- a/plugins/dali-sharp/sharp/internal/Shader.cs +++ b/plugins/dali-sharp/sharp/internal/Shader.cs @@ -26,7 +26,7 @@ namespace Dali { -public class Shader : Animatable { +internal class Shader : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Shader(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Shader_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/SignalConnectorType.cs b/plugins/dali-sharp/sharp/internal/SignalConnectorType.cs index b209f5d..73c901f 100644 --- a/plugins/dali-sharp/sharp/internal/SignalConnectorType.cs +++ b/plugins/dali-sharp/sharp/internal/SignalConnectorType.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SignalConnectorType : global::System.IDisposable { +internal class SignalConnectorType : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/SignalObserver.cs b/plugins/dali-sharp/sharp/internal/SignalObserver.cs index 36b1d11..8bc7549 100644 --- a/plugins/dali-sharp/sharp/internal/SignalObserver.cs +++ b/plugins/dali-sharp/sharp/internal/SignalObserver.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SignalObserver : global::System.IDisposable { +internal class SignalObserver : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/SizeScalePolicyType.cs b/plugins/dali-sharp/sharp/internal/SizeScalePolicyType.cs deleted file mode 100644 index 8d8e52b..0000000 --- a/plugins/dali-sharp/sharp/internal/SizeScalePolicyType.cs +++ /dev/null @@ -1,19 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum SizeScalePolicyType { - USE_SIZE_SET, - FIT_WITH_ASPECT_RATIO, - FILL_WITH_ASPECT_RATIO -} - -} diff --git a/plugins/dali-sharp/sharp/internal/Slider.cs b/plugins/dali-sharp/sharp/internal/Slider.cs index ee42f34..de3f75e 100644 --- a/plugins/dali-sharp/sharp/internal/Slider.cs +++ b/plugins/dali-sharp/sharp/internal/Slider.cs @@ -30,7 +30,7 @@ using System; using System.Runtime.InteropServices; -public class Slider : View { +internal class Slider : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Slider(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Slider_SWIGUpcast(cPtr), cMemoryOwn) { @@ -413,17 +413,12 @@ public class MarkReachedEventArgs : EventArgs return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public float LowerBound { get { float temp = 0.0f; - GetProperty( Slider.Property.LOWER_BOUND).Get( ref temp ); + GetProperty( Slider.Property.LOWER_BOUND).Get( out temp ); return temp; } set @@ -436,7 +431,7 @@ public class MarkReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( Slider.Property.UPPER_BOUND).Get( ref temp ); + GetProperty( Slider.Property.UPPER_BOUND).Get( out temp ); return temp; } set @@ -449,7 +444,7 @@ public class MarkReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( Slider.Property.VALUE).Get( ref temp ); + GetProperty( Slider.Property.VALUE).Get( out temp ); return temp; } set @@ -540,7 +535,7 @@ public class MarkReachedEventArgs : EventArgs get { int temp = 0; - GetProperty( Slider.Property.VALUE_PRECISION).Get( ref temp ); + GetProperty( Slider.Property.VALUE_PRECISION).Get( out temp ); return temp; } set @@ -553,7 +548,7 @@ public class MarkReachedEventArgs : EventArgs get { bool temp = false; - GetProperty( Slider.Property.SHOW_POPUP).Get( ref temp ); + GetProperty( Slider.Property.SHOW_POPUP).Get( out temp ); return temp; } set @@ -566,7 +561,7 @@ public class MarkReachedEventArgs : EventArgs get { bool temp = false; - GetProperty( Slider.Property.SHOW_VALUE).Get( ref temp ); + GetProperty( Slider.Property.SHOW_VALUE).Get( out temp ); return temp; } set @@ -592,7 +587,7 @@ public class MarkReachedEventArgs : EventArgs get { bool temp = false; - GetProperty( Slider.Property.SNAP_TO_MARKS).Get( ref temp ); + GetProperty( Slider.Property.SNAP_TO_MARKS).Get( out temp ); return temp; } set @@ -605,7 +600,7 @@ public class MarkReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( Slider.Property.MARK_TOLERANCE).Get( ref temp ); + GetProperty( Slider.Property.MARK_TOLERANCE).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs b/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs index 43d8d8a..c5954c9 100644 --- a/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/SliderMarkReachedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SliderMarkReachedSignal : global::System.IDisposable { +internal class SliderMarkReachedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs b/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs index 33484e3..9f7691d 100644 --- a/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/SliderValueChangedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SliderValueChangedSignal : global::System.IDisposable { +internal class SliderValueChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/SlotObserver.cs b/plugins/dali-sharp/sharp/internal/SlotObserver.cs index edcbf6b..3d11afd 100644 --- a/plugins/dali-sharp/sharp/internal/SlotObserver.cs +++ b/plugins/dali-sharp/sharp/internal/SlotObserver.cs @@ -10,7 +10,7 @@ namespace Dali { -public class SlotObserver : global::System.IDisposable { +internal class SlotObserver : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs b/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs index bab6816..df037fc 100644 --- a/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs +++ b/plugins/dali-sharp/sharp/internal/StageWheelSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class StageWheelSignal : global::System.IDisposable { +internal class StageWheelSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/StencilFunctionType.cs b/plugins/dali-sharp/sharp/internal/StencilFunctionType.cs index 314135b..fce9e20 100644 --- a/plugins/dali-sharp/sharp/internal/StencilFunctionType.cs +++ b/plugins/dali-sharp/sharp/internal/StencilFunctionType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum StencilFunctionType { +internal enum StencilFunctionType { NEVER, LESS, EQUAL, diff --git a/plugins/dali-sharp/sharp/internal/StencilOperationType.cs b/plugins/dali-sharp/sharp/internal/StencilOperationType.cs index 2b27f96..e13e7d2 100644 --- a/plugins/dali-sharp/sharp/internal/StencilOperationType.cs +++ b/plugins/dali-sharp/sharp/internal/StencilOperationType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum StencilOperationType { +internal enum StencilOperationType { ZERO, KEEP, REPLACE, diff --git a/plugins/dali-sharp/sharp/internal/StringValuePair.cs b/plugins/dali-sharp/sharp/internal/StringValuePair.cs index 7a978da..aadacec 100644 --- a/plugins/dali-sharp/sharp/internal/StringValuePair.cs +++ b/plugins/dali-sharp/sharp/internal/StringValuePair.cs @@ -10,7 +10,7 @@ namespace Dali { -public class StringValuePair : global::System.IDisposable { +internal class StringValuePair : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs b/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs index 6773371..2e51128 100644 --- a/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/StyleChangedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class StyleChangedSignal : global::System.IDisposable { +internal class StyleChangedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs b/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs index 5eda3bf6..80a131e 100644 --- a/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TapGestureDetectedSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TapGestureDetectedSignal : global::System.IDisposable { +internal class TapGestureDetectedSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs b/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs index 4150aa6..a2352e5 100644 --- a/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs +++ b/plugins/dali-sharp/sharp/internal/TapGestureDetector.cs @@ -29,7 +29,7 @@ namespace Dali { using System; using System.Runtime.InteropServices; -public class TapGestureDetector : GestureDetector { +internal class TapGestureDetector : GestureDetector { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal TapGestureDetector(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TapGestureDetector_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs b/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs index 6a94050..fe28018 100644 --- a/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TextEditorSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TextEditorSignal : global::System.IDisposable { +internal class TextEditorSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs b/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs index 5085104..e20524c 100644 --- a/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TextFieldSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TextFieldSignal : global::System.IDisposable { +internal class TextFieldSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/Texture.cs b/plugins/dali-sharp/sharp/internal/Texture.cs index 00c511c..7dae756 100644 --- a/plugins/dali-sharp/sharp/internal/Texture.cs +++ b/plugins/dali-sharp/sharp/internal/Texture.cs @@ -26,7 +26,7 @@ namespace Dali { -public class Texture : BaseHandle { +internal class Texture : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal Texture(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Texture_SWIGUpcast(cPtr), cMemoryOwn) { @@ -114,7 +114,7 @@ public class Texture : BaseHandle { return ret; } - public Texture(SWIGTYPE_p_Dali__Internal__Texture pointer) : this(NDalicPINVOKE.new_Texture__SWIG_2(SWIGTYPE_p_Dali__Internal__Texture.getCPtr(pointer)), true) { + internal Texture(SWIGTYPE_p_Dali__Internal__Texture pointer) : this(NDalicPINVOKE.new_Texture__SWIG_2(SWIGTYPE_p_Dali__Internal__Texture.getCPtr(pointer)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/TextureSet.cs b/plugins/dali-sharp/sharp/internal/TextureSet.cs index 52756a8..e2b9de0 100644 --- a/plugins/dali-sharp/sharp/internal/TextureSet.cs +++ b/plugins/dali-sharp/sharp/internal/TextureSet.cs @@ -26,7 +26,7 @@ namespace Dali { -public class TextureSet : BaseHandle { +internal class TextureSet : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal TextureSet(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextureSet_SWIGUpcast(cPtr), cMemoryOwn) { diff --git a/plugins/dali-sharp/sharp/internal/TextureType.cs b/plugins/dali-sharp/sharp/internal/TextureType.cs index 2ee172b..ce02281 100644 --- a/plugins/dali-sharp/sharp/internal/TextureType.cs +++ b/plugins/dali-sharp/sharp/internal/TextureType.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum TextureType { +internal enum TextureType { TEXTURE_2D, TEXTURE_CUBE } diff --git a/plugins/dali-sharp/sharp/internal/TimerSignalType.cs b/plugins/dali-sharp/sharp/internal/TimerSignalType.cs index 0d427c6..6ada393 100644 --- a/plugins/dali-sharp/sharp/internal/TimerSignalType.cs +++ b/plugins/dali-sharp/sharp/internal/TimerSignalType.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TimerSignalType : global::System.IDisposable { +internal class TimerSignalType : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ToolkitPropertyRange.cs b/plugins/dali-sharp/sharp/internal/ToolkitPropertyRange.cs index ee8d944..ed585a3 100644 --- a/plugins/dali-sharp/sharp/internal/ToolkitPropertyRange.cs +++ b/plugins/dali-sharp/sharp/internal/ToolkitPropertyRange.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum ToolkitPropertyRange { +internal enum ToolkitPropertyRange { VISUAL_PROPERTY_BASE_START_INDEX = PropertyRanges.CORE_PROPERTY_MAX_INDEX+1, VISUAL_PROPERTY_BASE_END_INDEX = VISUAL_PROPERTY_BASE_START_INDEX+100, VISUAL_PROPERTY_START_INDEX = VISUAL_PROPERTY_BASE_END_INDEX+1, diff --git a/plugins/dali-sharp/sharp/internal/TooltipPositionType.cs b/plugins/dali-sharp/sharp/internal/TooltipPositionType.cs deleted file mode 100644 index 26dd0cb..0000000 --- a/plugins/dali-sharp/sharp/internal/TooltipPositionType.cs +++ /dev/null @@ -1,19 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public enum TooltipPositionType { - ABOVE, - BELOW, - HOVER_POINT -} - -} diff --git a/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs b/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs index fba575f..44bf0f3 100644 --- a/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs +++ b/plugins/dali-sharp/sharp/internal/TouchPointContainer.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TouchPointContainer : global::System.IDisposable, global::System.Collections.IEnumerable +internal class TouchPointContainer : global::System.IDisposable, global::System.Collections.IEnumerable , global::System.Collections.Generic.IEnumerable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/plugins/dali-sharp/sharp/internal/TouchSignal.cs b/plugins/dali-sharp/sharp/internal/TouchSignal.cs index 77486de..64f528c 100644 --- a/plugins/dali-sharp/sharp/internal/TouchSignal.cs +++ b/plugins/dali-sharp/sharp/internal/TouchSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TouchSignal : global::System.IDisposable { +internal class TouchSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/TypeAction.cs b/plugins/dali-sharp/sharp/internal/TypeAction.cs index 187a3c9..3865aa4 100644 --- a/plugins/dali-sharp/sharp/internal/TypeAction.cs +++ b/plugins/dali-sharp/sharp/internal/TypeAction.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TypeAction : global::System.IDisposable { +internal class TypeAction : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -40,7 +40,7 @@ public class TypeAction : global::System.IDisposable { } } - public TypeAction(TypeRegistration registered, string name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool f) : this(NDalicPINVOKE.new_TypeAction(TypeRegistration.getCPtr(registered), name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.getCPtr(f)), true) { + internal TypeAction(TypeRegistration registered, string name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool f) : this(NDalicPINVOKE.new_TypeAction(TypeRegistration.getCPtr(registered), name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.getCPtr(f)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/TypeRegistration.cs b/plugins/dali-sharp/sharp/internal/TypeRegistration.cs index 6a9182d..bde652d 100644 --- a/plugins/dali-sharp/sharp/internal/TypeRegistration.cs +++ b/plugins/dali-sharp/sharp/internal/TypeRegistration.cs @@ -10,7 +10,7 @@ namespace Dali { -public class TypeRegistration : global::System.IDisposable { +internal class TypeRegistration : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -45,7 +45,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD return NDalicPINVOKE.new_TypeRegistration__SWIG_0(SWIGTYPE_p_std__type_info.getCPtr(registerType), SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip)); } - public TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f), true) { + internal TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -54,7 +54,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD return NDalicPINVOKE.new_TypeRegistration__SWIG_1(SWIGTYPE_p_std__type_info.getCPtr(registerType), SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip), callCreateOnInit); } - public TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f, bool callCreateOnInit) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f, callCreateOnInit), true) { + internal TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f, bool callCreateOnInit) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f, callCreateOnInit), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -63,7 +63,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD return NDalicPINVOKE.new_TypeRegistration__SWIG_2(name, SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip)); } - public TypeRegistration(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(name, baseType, f), true) { + internal TypeRegistration(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(name, baseType, f), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/VectorBase.cs b/plugins/dali-sharp/sharp/internal/VectorBase.cs index c4bd250..cb96ba4 100644 --- a/plugins/dali-sharp/sharp/internal/VectorBase.cs +++ b/plugins/dali-sharp/sharp/internal/VectorBase.cs @@ -10,7 +10,7 @@ namespace Dali { -public class VectorBase : global::System.IDisposable { +internal class VectorBase : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/VectorFloat.cs b/plugins/dali-sharp/sharp/internal/VectorFloat.cs deleted file mode 100644 index 1095042..0000000 --- a/plugins/dali-sharp/sharp/internal/VectorFloat.cs +++ /dev/null @@ -1,151 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public class VectorFloat : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal VectorFloat(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VectorFloat obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~VectorFloat() { - DisposeQueue.Instance.Add(this); - } - - public virtual void Dispose() { - if (!Window.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_VectorFloat(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - - public VectorFloat() : this(NDalicPINVOKE.new_VectorFloat__SWIG_0(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public VectorFloat(VectorFloat vector) : this(NDalicPINVOKE.new_VectorFloat__SWIG_1(VectorFloat.getCPtr(vector)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public VectorFloat Assign(VectorFloat vector) { - VectorFloat ret = new VectorFloat(NDalicPINVOKE.VectorFloat_Assign(swigCPtr, VectorFloat.getCPtr(vector)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_float Begin() { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_Begin(swigCPtr); - SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_float End() { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_End(swigCPtr); - SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_float ValueOfIndex(uint index) { - SWIGTYPE_p_float ret = new SWIGTYPE_p_float(NDalicPINVOKE.VectorFloat_ValueOfIndex__SWIG_0(swigCPtr, index), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void PushBack(float element) { - NDalicPINVOKE.VectorFloat_PushBack(swigCPtr, element); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Insert(SWIGTYPE_p_float at, float element) { - NDalicPINVOKE.VectorFloat_Insert__SWIG_0(swigCPtr, SWIGTYPE_p_float.getCPtr(at), element); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Insert(SWIGTYPE_p_float at, SWIGTYPE_p_float from, SWIGTYPE_p_float to) { - NDalicPINVOKE.VectorFloat_Insert__SWIG_1(swigCPtr, SWIGTYPE_p_float.getCPtr(at), SWIGTYPE_p_float.getCPtr(from), SWIGTYPE_p_float.getCPtr(to)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Reserve(uint count) { - NDalicPINVOKE.VectorFloat_Reserve(swigCPtr, count); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Resize(uint count) { - NDalicPINVOKE.VectorFloat_Resize__SWIG_0(swigCPtr, count); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Resize(uint count, float item) { - NDalicPINVOKE.VectorFloat_Resize__SWIG_1(swigCPtr, count, item); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public SWIGTYPE_p_float Erase(SWIGTYPE_p_float iterator) { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_Erase__SWIG_0(swigCPtr, SWIGTYPE_p_float.getCPtr(iterator)); - SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_float Erase(SWIGTYPE_p_float first, SWIGTYPE_p_float last) { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorFloat_Erase__SWIG_1(swigCPtr, SWIGTYPE_p_float.getCPtr(first), SWIGTYPE_p_float.getCPtr(last)); - SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void Remove(SWIGTYPE_p_float iterator) { - NDalicPINVOKE.VectorFloat_Remove(swigCPtr, SWIGTYPE_p_float.getCPtr(iterator)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Swap(VectorFloat vector) { - NDalicPINVOKE.VectorFloat_Swap(swigCPtr, VectorFloat.getCPtr(vector)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Clear() { - NDalicPINVOKE.VectorFloat_Clear(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Release() { - NDalicPINVOKE.VectorFloat_Release(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static readonly int BaseType = NDalicPINVOKE.VectorFloat_BaseType_get(); - -} - -} diff --git a/plugins/dali-sharp/sharp/internal/VectorInteger.cs b/plugins/dali-sharp/sharp/internal/VectorInteger.cs deleted file mode 100644 index 2999a00..0000000 --- a/plugins/dali-sharp/sharp/internal/VectorInteger.cs +++ /dev/null @@ -1,151 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public class VectorInteger : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal VectorInteger(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VectorInteger obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~VectorInteger() { - DisposeQueue.Instance.Add(this); - } - - public virtual void Dispose() { - if (!Window.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_VectorInteger(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - - public VectorInteger() : this(NDalicPINVOKE.new_VectorInteger__SWIG_0(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public VectorInteger(VectorInteger vector) : this(NDalicPINVOKE.new_VectorInteger__SWIG_1(VectorInteger.getCPtr(vector)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public VectorInteger Assign(VectorInteger vector) { - VectorInteger ret = new VectorInteger(NDalicPINVOKE.VectorInteger_Assign(swigCPtr, VectorInteger.getCPtr(vector)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_int Begin() { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_Begin(swigCPtr); - SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_int End() { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_End(swigCPtr); - SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_int ValueOfIndex(uint index) { - SWIGTYPE_p_int ret = new SWIGTYPE_p_int(NDalicPINVOKE.VectorInteger_ValueOfIndex__SWIG_0(swigCPtr, index), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void PushBack(int element) { - NDalicPINVOKE.VectorInteger_PushBack(swigCPtr, element); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Insert(SWIGTYPE_p_int at, int element) { - NDalicPINVOKE.VectorInteger_Insert__SWIG_0(swigCPtr, SWIGTYPE_p_int.getCPtr(at), element); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Insert(SWIGTYPE_p_int at, SWIGTYPE_p_int from, SWIGTYPE_p_int to) { - NDalicPINVOKE.VectorInteger_Insert__SWIG_1(swigCPtr, SWIGTYPE_p_int.getCPtr(at), SWIGTYPE_p_int.getCPtr(from), SWIGTYPE_p_int.getCPtr(to)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Reserve(uint count) { - NDalicPINVOKE.VectorInteger_Reserve(swigCPtr, count); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Resize(uint count) { - NDalicPINVOKE.VectorInteger_Resize__SWIG_0(swigCPtr, count); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Resize(uint count, int item) { - NDalicPINVOKE.VectorInteger_Resize__SWIG_1(swigCPtr, count, item); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public SWIGTYPE_p_int Erase(SWIGTYPE_p_int iterator) { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_Erase__SWIG_0(swigCPtr, SWIGTYPE_p_int.getCPtr(iterator)); - SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public SWIGTYPE_p_int Erase(SWIGTYPE_p_int first, SWIGTYPE_p_int last) { - global::System.IntPtr cPtr = NDalicPINVOKE.VectorInteger_Erase__SWIG_1(swigCPtr, SWIGTYPE_p_int.getCPtr(first), SWIGTYPE_p_int.getCPtr(last)); - SWIGTYPE_p_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_int(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void Remove(SWIGTYPE_p_int iterator) { - NDalicPINVOKE.VectorInteger_Remove(swigCPtr, SWIGTYPE_p_int.getCPtr(iterator)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Swap(VectorInteger vector) { - NDalicPINVOKE.VectorInteger_Swap(swigCPtr, VectorInteger.getCPtr(vector)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Clear() { - NDalicPINVOKE.VectorInteger_Clear(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Release() { - NDalicPINVOKE.VectorInteger_Release(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static readonly int BaseType = NDalicPINVOKE.VectorInteger_BaseType_get(); - -} - -} diff --git a/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs b/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs index 6a0675d..a89364e 100644 --- a/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs +++ b/plugins/dali-sharp/sharp/internal/VectorUint16Pair.cs @@ -10,7 +10,7 @@ namespace Dali { -public class VectorUint16Pair : global::System.IDisposable { +internal class VectorUint16Pair : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs b/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs index 17bd899..9b18d69 100644 --- a/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs +++ b/plugins/dali-sharp/sharp/internal/VectorUnsignedChar.cs @@ -10,7 +10,7 @@ namespace Dali { -public class VectorUnsignedChar : global::System.IDisposable { +internal class VectorUnsignedChar : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -60,21 +60,21 @@ public class VectorUnsignedChar : global::System.IDisposable { return ret; } - public SWIGTYPE_p_unsigned_char Begin() { + internal SWIGTYPE_p_unsigned_char Begin() { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_Begin(swigCPtr); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public SWIGTYPE_p_unsigned_char End() { + internal SWIGTYPE_p_unsigned_char End() { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_End(swigCPtr); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public SWIGTYPE_p_unsigned_char ValueOfIndex(uint index) { + internal SWIGTYPE_p_unsigned_char ValueOfIndex(uint index) { SWIGTYPE_p_unsigned_char ret = new SWIGTYPE_p_unsigned_char(NDalicPINVOKE.VectorUnsignedChar_ValueOfIndex__SWIG_0(swigCPtr, index), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -90,7 +90,7 @@ public class VectorUnsignedChar : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Insert(byte[] at, SWIGTYPE_p_unsigned_char from, SWIGTYPE_p_unsigned_char to) { + internal void Insert(byte[] at, SWIGTYPE_p_unsigned_char from, SWIGTYPE_p_unsigned_char to) { NDalicPINVOKE.VectorUnsignedChar_Insert__SWIG_1(swigCPtr, at, SWIGTYPE_p_unsigned_char.getCPtr(from), SWIGTYPE_p_unsigned_char.getCPtr(to)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -110,14 +110,14 @@ public class VectorUnsignedChar : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_unsigned_char Erase(byte[] iterator) { + internal SWIGTYPE_p_unsigned_char Erase(byte[] iterator) { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_Erase__SWIG_0(swigCPtr, iterator); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public SWIGTYPE_p_unsigned_char Erase(byte[] first, SWIGTYPE_p_unsigned_char last) { + internal SWIGTYPE_p_unsigned_char Erase(byte[] first, SWIGTYPE_p_unsigned_char last) { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_Erase__SWIG_1(swigCPtr, first, SWIGTYPE_p_unsigned_char.getCPtr(last)); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs b/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs index c3cadf4..b590f7f 100644 --- a/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs +++ b/plugins/dali-sharp/sharp/internal/VideoViewSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class VideoViewSignal : global::System.IDisposable { +internal class VideoViewSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ViewContainer.cs b/plugins/dali-sharp/sharp/internal/ViewContainer.cs deleted file mode 100644 index 76251e6..0000000 --- a/plugins/dali-sharp/sharp/internal/ViewContainer.cs +++ /dev/null @@ -1,321 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.10 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ - -namespace Dali { - -public class ViewContainer : global::System.IDisposable, global::System.Collections.IEnumerable - , global::System.Collections.Generic.IEnumerable - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ViewContainer(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewContainer obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~ViewContainer() { - DisposeQueue.Instance.Add(this); - } - - public virtual void Dispose() { - if (!Window.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } - - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ActorContainer(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - - public ViewContainer(global::System.Collections.ICollection c) : this() { - if (c == null) - throw new global::System.ArgumentNullException("c"); - foreach (View element in c) { - this.Add(element); - } - } - - public bool IsFixedSize { - get { - return false; - } - } - - public bool IsReadOnly { - get { - return false; - } - } - - public View this[int index] { - get { - return getitem(index); - } - set { - setitem(index, value); - } - } - - public int Capacity { - get { - return (int)capacity(); - } - set { - if (value < size()) - throw new global::System.ArgumentOutOfRangeException("Capacity"); - reserve((uint)value); - } - } - - public int Count { - get { - return (int)size(); - } - } - - public bool IsSynchronized { - get { - return false; - } - } - - public void CopyTo(View[] array) - { - CopyTo(0, array, 0, this.Count); - } - - public void CopyTo(View[] array, int arrayIndex) - { - CopyTo(0, array, arrayIndex, this.Count); - } - - public void CopyTo(int index, View[] array, int arrayIndex, int count) - { - if (array == null) - throw new global::System.ArgumentNullException("array"); - if (index < 0) - throw new global::System.ArgumentOutOfRangeException("index", "Value is less than zero"); - if (arrayIndex < 0) - throw new global::System.ArgumentOutOfRangeException("arrayIndex", "Value is less than zero"); - if (count < 0) - throw new global::System.ArgumentOutOfRangeException("count", "Value is less than zero"); - if (array.Rank > 1) - throw new global::System.ArgumentException("Multi dimensional array.", "array"); - if (index+count > this.Count || arrayIndex+count > array.Length) - throw new global::System.ArgumentException("Number of elements to copy is too large."); - for (int i=0; i global::System.Collections.Generic.IEnumerable.GetEnumerator() { - return new ViewContainerEnumerator(this); - } - - global::System.Collections.IEnumerator global::System.Collections.IEnumerable.GetEnumerator() { - return new ViewContainerEnumerator(this); - } - - public ViewContainerEnumerator GetEnumerator() { - return new ViewContainerEnumerator(this); - } - - // Type-safe enumerator - /// Note that the IEnumerator documentation requires an InvalidOperationException to be thrown - /// whenever the collection is modified. This has been done for changes in the size of the - /// collection but not when one of the elements of the collection is modified as it is a bit - /// tricky to detect unmanaged code that modifies the collection under our feet. - public sealed class ViewContainerEnumerator : global::System.Collections.IEnumerator - , global::System.Collections.Generic.IEnumerator - { - private ViewContainer collectionRef; - private int currentIndex; - private object currentObject; - private int currentSize; - - public ViewContainerEnumerator(ViewContainer collection) { - collectionRef = collection; - currentIndex = -1; - currentObject = null; - currentSize = collectionRef.Count; - } - - // Type-safe iterator Current - public View Current { - get { - if (currentIndex == -1) - throw new global::System.InvalidOperationException("Enumeration not started."); - if (currentIndex > currentSize - 1) - throw new global::System.InvalidOperationException("Enumeration finished."); - if (currentObject == null) - throw new global::System.InvalidOperationException("Collection modified."); - return (View)currentObject; - } - } - - // Type-unsafe IEnumerator.Current - object global::System.Collections.IEnumerator.Current { - get { - return Current; - } - } - - public bool MoveNext() { - int size = collectionRef.Count; - bool moveOkay = (currentIndex+1 < size) && (size == currentSize); - if (moveOkay) { - currentIndex++; - currentObject = collectionRef[currentIndex]; - } else { - currentObject = null; - } - return moveOkay; - } - - public void Reset() { - currentIndex = -1; - currentObject = null; - if (collectionRef.Count != currentSize) { - throw new global::System.InvalidOperationException("Collection modified."); - } - } - - public void Dispose() { - currentIndex = -1; - currentObject = null; - } - } - - public void Clear() { - NDalicPINVOKE.ActorContainer_Clear(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Add(View x) { - NDalicPINVOKE.ActorContainer_Add(swigCPtr, View.getCPtr(x)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - private uint size() { - uint ret = NDalicPINVOKE.ActorContainer_size(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private uint capacity() { - uint ret = NDalicPINVOKE.ActorContainer_capacity(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private void reserve(uint n) { - NDalicPINVOKE.ActorContainer_reserve(swigCPtr, n); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ViewContainer() : this(NDalicPINVOKE.new_ActorContainer__SWIG_0(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ViewContainer(ViewContainer other) : this(NDalicPINVOKE.new_ActorContainer__SWIG_1(ViewContainer.getCPtr(other)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ViewContainer(int capacity) : this(NDalicPINVOKE.new_ActorContainer__SWIG_2(capacity), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - private View getitemcopy(int index) { - View ret = new View(NDalicPINVOKE.ActorContainer_getitemcopy(swigCPtr, index), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private View getitem(int index) { - View ret = new View(NDalicPINVOKE.ActorContainer_getitem(swigCPtr, index), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private void setitem(int index, View val) { - NDalicPINVOKE.ActorContainer_setitem(swigCPtr, index, View.getCPtr(val)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void AddRange(ViewContainer values) { - NDalicPINVOKE.ActorContainer_AddRange(swigCPtr, ViewContainer.getCPtr(values)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ViewContainer GetRange(int index, int count) { - global::System.IntPtr cPtr = NDalicPINVOKE.ActorContainer_GetRange(swigCPtr, index, count); - ViewContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new ViewContainer(cPtr, true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void Insert(int index, View x) { - NDalicPINVOKE.ActorContainer_Insert(swigCPtr, index, View.getCPtr(x)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void InsertRange(int index, ViewContainer values) { - NDalicPINVOKE.ActorContainer_InsertRange(swigCPtr, index, ViewContainer.getCPtr(values)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void RemoveAt(int index) { - NDalicPINVOKE.ActorContainer_RemoveAt(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void RemoveRange(int index, int count) { - NDalicPINVOKE.ActorContainer_RemoveRange(swigCPtr, index, count); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static ViewContainer Repeat(View value, int count) { - global::System.IntPtr cPtr = NDalicPINVOKE.ActorContainer_Repeat(View.getCPtr(value), count); - ViewContainer ret = (cPtr == global::System.IntPtr.Zero) ? null : new ViewContainer(cPtr, true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void Reverse() { - NDalicPINVOKE.ActorContainer_Reverse__SWIG_0(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Reverse(int index, int count) { - NDalicPINVOKE.ActorContainer_Reverse__SWIG_1(swigCPtr, index, count); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetRange(int index, ViewContainer values) { - NDalicPINVOKE.ActorContainer_SetRange(swigCPtr, index, ViewContainer.getCPtr(values)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - -} - -} diff --git a/plugins/dali-sharp/sharp/internal/ViewImpl.cs b/plugins/dali-sharp/sharp/internal/ViewImpl.cs index 52a8c3d..64cad20 100644 --- a/plugins/dali-sharp/sharp/internal/ViewImpl.cs +++ b/plugins/dali-sharp/sharp/internal/ViewImpl.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ViewImpl : CustomActorImpl { +internal class ViewImpl : CustomActorImpl { private global::System.Runtime.InteropServices.HandleRef swigCPtr; internal ViewImpl(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ViewImpl_SWIGUpcast(cPtr), cMemoryOwn) { @@ -112,39 +112,39 @@ public class ViewImpl : CustomActorImpl { return ret; } - public void SetKeyboardNavigationSupport(bool isSupported) { + public void SetFocusNavigationSupport(bool isSupported) { NDalicPINVOKE.ViewImpl_SetKeyboardNavigationSupport(swigCPtr, isSupported); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool IsKeyboardNavigationSupported() { + public bool IsFocusNavigationSupported() { bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardNavigationSupported(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetKeyInputFocus() { + public void SetFocus() { NDalicPINVOKE.ViewImpl_SetKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool HasKeyInputFocus() { + public bool HasFocus() { bool ret = NDalicPINVOKE.ViewImpl_HasKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void ClearKeyInputFocus() { + public void ClearFocus() { NDalicPINVOKE.ViewImpl_ClearKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetAsKeyboardFocusGroup(bool isFocusGroup) { + public void SetAsFocusGroup(bool isFocusGroup) { NDalicPINVOKE.ViewImpl_SetAsKeyboardFocusGroup(swigCPtr, isFocusGroup); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool IsKeyboardFocusGroup() { + public bool IsFocusGroup() { bool ret = NDalicPINVOKE.ViewImpl_IsKeyboardFocusGroup(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -155,18 +155,18 @@ public class ViewImpl : CustomActorImpl { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void KeyboardEnter() { + public void FocusEnter() { NDalicPINVOKE.ViewImpl_KeyboardEnter(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ControlKeySignal KeyEventSignal() { + internal ControlKeySignal KeyEventSignal() { ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.ViewImpl_KeyEventSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public KeyInputFocusSignal KeyInputFocusGainedSignal() { + public KeyInputFocusSignal FocusGainedSignal() { KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ViewImpl_KeyInputFocusGainedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -349,29 +349,29 @@ public class ViewImpl : CustomActorImpl { return ret; } - public virtual void OnKeyInputFocusGained() { - if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusGained(swigCPtr); + public virtual void OnFocusGained() { + if (SwigDerivedClassHasMethod("OnFocusGained", swigMethodTypes30)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusGainedSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusGained(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void OnKeyInputFocusLost() { - if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusLost(swigCPtr); + public virtual void OnFocusLost() { + if (SwigDerivedClassHasMethod("OnFocusLost", swigMethodTypes31)) NDalicPINVOKE.ViewImpl_OnKeyInputFocusLostSwigExplicitViewImpl(swigCPtr); else NDalicPINVOKE.ViewImpl_OnKeyInputFocusLost(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual View GetNextKeyboardFocusableView(View currentFocusedView, View.KeyboardFocus.Direction direction, bool loopEnabled) { - View ret = new View((SwigDerivedClassHasMethod("GetNextKeyboardFocusableView", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, View.getCPtr(currentFocusedView), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, View.getCPtr(currentFocusedView), (int)direction, loopEnabled)), true); + public virtual View GetNextFocusableView(View currentFocusedView, View.Focus.Direction direction, bool loopEnabled) { + View ret = new View((SwigDerivedClassHasMethod("GetNextFocusableView", swigMethodTypes32) ? NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActorSwigExplicitViewImpl(swigCPtr, View.getCPtr(currentFocusedView), (int)direction, loopEnabled) : NDalicPINVOKE.ViewImpl_GetNextKeyboardFocusableActor(swigCPtr, View.getCPtr(currentFocusedView), (int)direction, loopEnabled)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public virtual void OnKeyboardFocusChangeCommitted(View commitedFocusableView) { - if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, View.getCPtr(commitedFocusableView)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, View.getCPtr(commitedFocusableView)); + public virtual void OnFocusChangeCommitted(View commitedFocusableView) { + if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33)) NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommittedSwigExplicitViewImpl(swigCPtr, View.getCPtr(commitedFocusableView)); else NDalicPINVOKE.ViewImpl_OnKeyboardFocusChangeCommitted(swigCPtr, View.getCPtr(commitedFocusableView)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual bool OnKeyboardEnter() { - bool ret = (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34) ? NDalicPINVOKE.ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnKeyboardEnter(swigCPtr)); + public virtual bool OnFocusEnter() { + bool ret = (SwigDerivedClassHasMethod("OnFocusEnter", swigMethodTypes34) ? NDalicPINVOKE.ViewImpl_OnKeyboardEnterSwigExplicitViewImpl(swigCPtr) : NDalicPINVOKE.ViewImpl_OnKeyboardEnter(swigCPtr)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -467,16 +467,16 @@ public class ViewImpl : CustomActorImpl { swigDelegate28 = new SwigDelegateViewImpl_28(SwigDirectorOnAccessibilityValueChange); if (SwigDerivedClassHasMethod("OnAccessibilityZoom", swigMethodTypes29)) swigDelegate29 = new SwigDelegateViewImpl_29(SwigDirectorOnAccessibilityZoom); - if (SwigDerivedClassHasMethod("OnKeyInputFocusGained", swigMethodTypes30)) - swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnKeyInputFocusGained); - if (SwigDerivedClassHasMethod("OnKeyInputFocusLost", swigMethodTypes31)) - swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnKeyInputFocusLost); - if (SwigDerivedClassHasMethod("GetNextKeyboardFocusableView", swigMethodTypes32)) - swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextKeyboardFocusableView); - if (SwigDerivedClassHasMethod("OnKeyboardFocusChangeCommitted", swigMethodTypes33)) - swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnKeyboardFocusChangeCommitted); - if (SwigDerivedClassHasMethod("OnKeyboardEnter", swigMethodTypes34)) - swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnKeyboardEnter); + if (SwigDerivedClassHasMethod("OnFocusGained", swigMethodTypes30)) + swigDelegate30 = new SwigDelegateViewImpl_30(SwigDirectorOnFocusGained); + if (SwigDerivedClassHasMethod("OnFocusLost", swigMethodTypes31)) + swigDelegate31 = new SwigDelegateViewImpl_31(SwigDirectorOnFocusLost); + if (SwigDerivedClassHasMethod("GetNextFocusableView", swigMethodTypes32)) + swigDelegate32 = new SwigDelegateViewImpl_32(SwigDirectorGetNextFocusableView); + if (SwigDerivedClassHasMethod("OnFocusChangeCommitted", swigMethodTypes33)) + swigDelegate33 = new SwigDelegateViewImpl_33(SwigDirectorOnFocusChangeCommitted); + if (SwigDerivedClassHasMethod("OnFocusEnter", swigMethodTypes34)) + swigDelegate34 = new SwigDelegateViewImpl_34(SwigDirectorOnFocusEnter); if (SwigDerivedClassHasMethod("OnPinch", swigMethodTypes35)) swigDelegate35 = new SwigDelegateViewImpl_35(SwigDirectorOnPinch); if (SwigDerivedClassHasMethod("OnPan", swigMethodTypes36)) @@ -618,24 +618,24 @@ public class ViewImpl : CustomActorImpl { return OnAccessibilityZoom(); } - private void SwigDirectorOnKeyInputFocusGained() { - OnKeyInputFocusGained(); + private void SwigDirectorOnFocusGained() { + OnFocusGained(); } - private void SwigDirectorOnKeyInputFocusLost() { - OnKeyInputFocusLost(); + private void SwigDirectorOnFocusLost() { + OnFocusLost(); } - private global::System.IntPtr SwigDirectorGetNextKeyboardFocusableView(global::System.IntPtr currentFocusedView, int direction, bool loopEnabled) { - return View.getCPtr(GetNextKeyboardFocusableView(new View(currentFocusedView, true), (View.KeyboardFocus.Direction)direction, loopEnabled)).Handle; + private global::System.IntPtr SwigDirectorGetNextFocusableView(global::System.IntPtr currentFocusedView, int direction, bool loopEnabled) { + return View.getCPtr(GetNextFocusableView(new View(currentFocusedView, true), (View.Focus.Direction)direction, loopEnabled)).Handle; } - private void SwigDirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableView) { - OnKeyboardFocusChangeCommitted(new View(commitedFocusableView, true)); + private void SwigDirectorOnFocusChangeCommitted(global::System.IntPtr commitedFocusableView) { + OnFocusChangeCommitted(new View(commitedFocusableView, true)); } - private bool SwigDirectorOnKeyboardEnter() { - return OnKeyboardEnter(); + private bool SwigDirectorOnFocusEnter() { + return OnFocusEnter(); } private void SwigDirectorOnPinch(global::System.IntPtr pinch) { @@ -778,7 +778,7 @@ public class ViewImpl : CustomActorImpl { private static global::System.Type[] swigMethodTypes29 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes30 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes31 = new global::System.Type[] { }; - private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(View), typeof(View.KeyboardFocus.Direction), typeof(bool) }; + private static global::System.Type[] swigMethodTypes32 = new global::System.Type[] { typeof(View), typeof(View.Focus.Direction), typeof(bool) }; private static global::System.Type[] swigMethodTypes33 = new global::System.Type[] { typeof(View) }; private static global::System.Type[] swigMethodTypes34 = new global::System.Type[] { }; private static global::System.Type[] swigMethodTypes35 = new global::System.Type[] { typeof(PinchGesture) }; diff --git a/plugins/dali-sharp/sharp/internal/ViewMode.cs b/plugins/dali-sharp/sharp/internal/ViewMode.cs index e50bee6..45ac8a8 100644 --- a/plugins/dali-sharp/sharp/internal/ViewMode.cs +++ b/plugins/dali-sharp/sharp/internal/ViewMode.cs @@ -10,7 +10,7 @@ namespace Dali { -public enum ViewMode { +internal enum ViewMode { MONO, STEREO_HORIZONTAL, STEREO_VERTICAL, diff --git a/plugins/dali-sharp/sharp/internal/ViewRegistry.cs b/plugins/dali-sharp/sharp/internal/ViewRegistry.cs index 70d5001..5fad5fa 100755 --- a/plugins/dali-sharp/sharp/internal/ViewRegistry.cs +++ b/plugins/dali-sharp/sharp/internal/ViewRegistry.cs @@ -68,7 +68,7 @@ namespace Dali /// /// /// - public class ScriptableProperty : System.Attribute + internal class ScriptableProperty : System.Attribute { public enum ScriptableType { @@ -117,7 +117,7 @@ namespace Dali /// /// /// - public sealed class ViewRegistry + internal sealed class ViewRegistry { /// /// ViewRegistry is a singleton @@ -420,7 +420,7 @@ namespace Dali if ( type.Equals (typeof(Int32)) ) { int value = 0; - ok = propValue.Get( ref value ); + ok = propValue.Get( out value ); if ( ok ) { propertyInfo.SetValue (view, value); @@ -429,7 +429,7 @@ namespace Dali else if ( type.Equals (typeof(bool)) ) { bool value = false; - ok = propValue.Get( ref value ); + ok = propValue.Get( out value ); if ( ok ) { propertyInfo.SetValue (view, value); @@ -438,7 +438,7 @@ namespace Dali else if ( type.Equals (typeof(float)) ) { float value = 0; - ok = propValue.Get( ref value ); + ok = propValue.Get( out value ); if ( ok ) { propertyInfo.SetValue (view, value); diff --git a/plugins/dali-sharp/sharp/internal/ViewRegistryHelper.cs b/plugins/dali-sharp/sharp/internal/ViewRegistryHelper.cs index 320f58a..f648bca 100644 --- a/plugins/dali-sharp/sharp/internal/ViewRegistryHelper.cs +++ b/plugins/dali-sharp/sharp/internal/ViewRegistryHelper.cs @@ -3,7 +3,7 @@ // include all custom views here which will be namespace Dali { - public class ViewRegistryHelper + internal class ViewRegistryHelper { static public void Initialize() { diff --git a/plugins/dali-sharp/sharp/internal/ViewSignal.cs b/plugins/dali-sharp/sharp/internal/ViewSignal.cs index 19ce910..1c3220a 100644 --- a/plugins/dali-sharp/sharp/internal/ViewSignal.cs +++ b/plugins/dali-sharp/sharp/internal/ViewSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ViewSignal : global::System.IDisposable { +internal class ViewSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs index 15ac680..bf473d5 100644 --- a/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs +++ b/plugins/dali-sharp/sharp/internal/ViewWrapperImpl.cs @@ -17,7 +17,7 @@ namespace Dali { - public sealed class ViewWrapperImpl : ViewImpl + internal sealed class ViewWrapperImpl : ViewImpl { private global::System.Runtime.InteropServices.HandleRef swigCPtr; public delegate void OnStageConnectionDelegate(int depth); @@ -49,11 +49,11 @@ namespace Dali public delegate bool OnAccessibilityTouchDelegate(Touch touch); public delegate bool OnAccessibilityValueChangeDelegate(bool isIncrease); public delegate bool OnAccessibilityZoomDelegate(); - public delegate void OnKeyInputFocusGainedDelegate(); - public delegate void OnKeyInputFocusLostDelegate(); - public delegate View GetNextKeyboardFocusableActorDelegate(View currentFocusedActor, View.KeyboardFocus.Direction direction, bool loopEnabled); - public delegate void OnKeyboardFocusChangeCommittedDelegate(View commitedFocusableActor); - public delegate bool OnKeyboardEnterDelegate(); + public delegate void OnFocusGainedDelegate(); + public delegate void OnFocusLostDelegate(); + public delegate View GetNextFocusableActorDelegate(View currentFocusedActor, View.Focus.Direction direction, bool loopEnabled); + public delegate void OnFocusChangeCommittedDelegate(View commitedFocusableActor); + public delegate bool OnFocusEnterDelegate(); public delegate void OnPinchDelegate(PinchGesture pinch); public delegate void OnPanDelegate(PanGesture pan); public delegate void OnTapDelegate(TapGesture tap); @@ -88,11 +88,11 @@ namespace Dali public OnAccessibilityTouchDelegate OnAccessibilityTouch; public OnAccessibilityValueChangeDelegate OnAccessibilityValueChange; public OnAccessibilityZoomDelegate OnAccessibilityZoom; - public OnKeyInputFocusGainedDelegate OnKeyInputFocusGained; - public OnKeyInputFocusLostDelegate OnKeyInputFocusLost; - public GetNextKeyboardFocusableActorDelegate GetNextKeyboardFocusableActor; - public OnKeyboardFocusChangeCommittedDelegate OnKeyboardFocusChangeCommitted; - public OnKeyboardEnterDelegate OnKeyboardEnter; + public OnFocusGainedDelegate OnFocusGained; + public OnFocusLostDelegate OnFocusLost; + public GetNextFocusableActorDelegate GetNextFocusableActor; + public OnFocusChangeCommittedDelegate OnFocusChangeCommitted; + public OnFocusEnterDelegate OnFocusEnter; public OnPinchDelegate OnPinch; public OnPanDelegate OnPan; public OnTapDelegate OnTap; @@ -137,7 +137,7 @@ namespace Dali } } - public ViewWrapperImpl(ViewWrapperImpl.CustomViewBehaviour behaviourFlags) : this(NDalicManualPINVOKE.new_ViewWrapperImpl((int)behaviourFlags), true) + public ViewWrapperImpl(CustomViewBehaviour behaviourFlags) : this(NDalicManualPINVOKE.new_ViewWrapperImpl((int)behaviourFlags), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); DirectorConnect(); @@ -236,7 +236,7 @@ namespace Dali return ret; } - public void EmitKeyInputFocusSignal(bool focusGained) + public void EmitFocusSignal(bool focusGained) { NDalicManualPINVOKE.ViewWrapperImpl_EmitKeyInputFocusSignal(swigCPtr, focusGained); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -280,11 +280,11 @@ namespace Dali Delegate27 = new DelegateViewWrapperImpl_27(DirectorOnAccessibilityTouch); Delegate28 = new DelegateViewWrapperImpl_28(DirectorOnAccessibilityValueChange); Delegate29 = new DelegateViewWrapperImpl_29(DirectorOnAccessibilityZoom); - Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnKeyInputFocusGained); - Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnKeyInputFocusLost); - Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextKeyboardFocusableActor); - Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnKeyboardFocusChangeCommitted); - Delegate34 = new DelegateViewWrapperImpl_34(DirectorOnKeyboardEnter); + Delegate30 = new DelegateViewWrapperImpl_30(DirectorOnFocusGained); + Delegate31 = new DelegateViewWrapperImpl_31(DirectorOnFocusLost); + Delegate32 = new DelegateViewWrapperImpl_32(DirectorGetNextFocusableActor); + Delegate33 = new DelegateViewWrapperImpl_33(DirectorOnFocusChangeCommitted); + Delegate34 = new DelegateViewWrapperImpl_34(DirectorOnFocusEnter); Delegate35 = new DelegateViewWrapperImpl_35(DirectorOnPinch); Delegate36 = new DelegateViewWrapperImpl_36(DirectorOnPan); Delegate37 = new DelegateViewWrapperImpl_37(DirectorOnTap); @@ -447,29 +447,29 @@ namespace Dali return OnAccessibilityZoom(); } - private void DirectorOnKeyInputFocusGained() + private void DirectorOnFocusGained() { - OnKeyInputFocusGained(); + OnFocusGained(); } - private void DirectorOnKeyInputFocusLost() + private void DirectorOnFocusLost() { - OnKeyInputFocusLost(); + OnFocusLost(); } - private global::System.IntPtr DirectorGetNextKeyboardFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) + private global::System.IntPtr DirectorGetNextFocusableActor(global::System.IntPtr currentFocusedActor, int direction, bool loopEnabled) { - return View.getCPtr(GetNextKeyboardFocusableActor(new View(currentFocusedActor, false), (View.KeyboardFocus.Direction)direction, loopEnabled)).Handle; + return View.getCPtr(GetNextFocusableActor(new View(currentFocusedActor, false), (View.Focus.Direction)direction, loopEnabled)).Handle; } - private void DirectorOnKeyboardFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) + private void DirectorOnFocusChangeCommitted(global::System.IntPtr commitedFocusableActor) { - OnKeyboardFocusChangeCommitted(new View(commitedFocusableActor, false)); + OnFocusChangeCommitted(new View(commitedFocusableActor, false)); } - private bool DirectorOnKeyboardEnter() + private bool DirectorOnFocusEnter() { - return OnKeyboardEnter(); + return OnFocusEnter(); } private void DirectorOnPinch(global::System.IntPtr pinch) @@ -576,15 +576,6 @@ namespace Dali private DelegateViewWrapperImpl_39 Delegate39; private DelegateViewWrapperImpl_40 Delegate40; - public enum CustomViewBehaviour - { - VIEW_BEHAVIOUR_DEFAULT = 0, - DISABLE_SIZE_NEGOTIATION = 1 << 0, - REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << 5, - DISABLE_STYLE_CHANGE_SIGNALS = 1 << 6, - LAST_VIEW_BEHAVIOUR_FLAG - } - public static readonly int VIEW_BEHAVIOUR_FLAG_COUNT = NDalicManualPINVOKE.ViewWrapperImpl_CONTROL_BEHAVIOUR_FLAG_COUNT_get(); } } diff --git a/plugins/dali-sharp/sharp/internal/VoidSignal.cs b/plugins/dali-sharp/sharp/internal/VoidSignal.cs index f19a51a..8ed90ab 100644 --- a/plugins/dali-sharp/sharp/internal/VoidSignal.cs +++ b/plugins/dali-sharp/sharp/internal/VoidSignal.cs @@ -10,7 +10,7 @@ namespace Dali { -public class VoidSignal : global::System.IDisposable { +internal class VoidSignal : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -78,7 +78,7 @@ System.IntPtr ip = System.Runtime.InteropServices.Marshal.GetFunctionPointerForD } } - public void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1) { + internal void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1) { NDalicPINVOKE.VoidSignal_Connect__SWIG_4(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), SWIGTYPE_p_Dali__FunctorDelegate.getCPtr(arg1)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/WindowFocusSignalType.cs b/plugins/dali-sharp/sharp/internal/WindowFocusSignalType.cs index ae9dde1..692d414 100644 --- a/plugins/dali-sharp/sharp/internal/WindowFocusSignalType.cs +++ b/plugins/dali-sharp/sharp/internal/WindowFocusSignalType.cs @@ -10,7 +10,7 @@ namespace Dali { -public class WindowFocusSignalType : global::System.IDisposable { +internal class WindowFocusSignalType : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/doublep.cs b/plugins/dali-sharp/sharp/internal/doublep.cs index 8e677fb..9987297 100644 --- a/plugins/dali-sharp/sharp/internal/doublep.cs +++ b/plugins/dali-sharp/sharp/internal/doublep.cs @@ -10,7 +10,7 @@ namespace Dali { -public class doublep : global::System.IDisposable { +internal class doublep : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/floatp.cs b/plugins/dali-sharp/sharp/internal/floatp.cs index 65406e2..1761f77 100644 --- a/plugins/dali-sharp/sharp/internal/floatp.cs +++ b/plugins/dali-sharp/sharp/internal/floatp.cs @@ -10,7 +10,7 @@ namespace Dali { -public class floatp : global::System.IDisposable { +internal class floatp : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/intp.cs b/plugins/dali-sharp/sharp/internal/intp.cs index 2ebfdcc..bd2e350 100644 --- a/plugins/dali-sharp/sharp/internal/intp.cs +++ b/plugins/dali-sharp/sharp/internal/intp.cs @@ -10,7 +10,7 @@ namespace Dali { -public class intp : global::System.IDisposable { +internal class intp : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; diff --git a/plugins/dali-sharp/sharp/internal/uintp.cs b/plugins/dali-sharp/sharp/internal/uintp.cs index 8ce3bea..620e037 100644 --- a/plugins/dali-sharp/sharp/internal/uintp.cs +++ b/plugins/dali-sharp/sharp/internal/uintp.cs @@ -10,7 +10,7 @@ namespace Dali { -public class uintp : global::System.IDisposable { +internal class uintp : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -55,14 +55,14 @@ public class uintp : global::System.IDisposable { return ret; } - public SWIGTYPE_p_unsigned_int cast() { + internal SWIGTYPE_p_unsigned_int cast() { global::System.IntPtr cPtr = NDalicPINVOKE.uintp_cast(swigCPtr); SWIGTYPE_p_unsigned_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_int(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static uintp frompointer(SWIGTYPE_p_unsigned_int t) { + internal static uintp frompointer(SWIGTYPE_p_unsigned_int t) { global::System.IntPtr cPtr = NDalicPINVOKE.uintp_frompointer(SWIGTYPE_p_unsigned_int.getCPtr(t)); uintp ret = (cPtr == global::System.IntPtr.Zero) ? null : new uintp(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/ushortp.cs b/plugins/dali-sharp/sharp/internal/ushortp.cs index dcdc615..e0a34d4 100644 --- a/plugins/dali-sharp/sharp/internal/ushortp.cs +++ b/plugins/dali-sharp/sharp/internal/ushortp.cs @@ -10,7 +10,7 @@ namespace Dali { -public class ushortp : global::System.IDisposable { +internal class ushortp : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -62,7 +62,7 @@ public class ushortp : global::System.IDisposable { return ret; } - public static ushortp frompointer(SWIGTYPE_p_unsigned_short t) { + internal static ushortp frompointer(SWIGTYPE_p_unsigned_short t) { global::System.IntPtr cPtr = NDalicPINVOKE.ushortp_frompointer(SWIGTYPE_p_unsigned_short.getCPtr(t)); ushortp ret = (cPtr == global::System.IntPtr.Zero) ? null : new ushortp(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/AlignType.cs b/plugins/dali-sharp/sharp/public/AlignType.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/AlignType.cs rename to plugins/dali-sharp/sharp/public/AlignType.cs diff --git a/plugins/dali-sharp/sharp/internal/AlphaFunction.cs b/plugins/dali-sharp/sharp/public/AlphaFunction.cs similarity index 94% rename from plugins/dali-sharp/sharp/internal/AlphaFunction.cs rename to plugins/dali-sharp/sharp/public/AlphaFunction.cs index de08a1e..244a663 100644 --- a/plugins/dali-sharp/sharp/internal/AlphaFunction.cs +++ b/plugins/dali-sharp/sharp/public/AlphaFunction.cs @@ -59,7 +59,7 @@ public class AlphaFunction : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public AlphaFunction(SWIGTYPE_p_f_float__float function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(function)), true) { + internal AlphaFunction(SWIGTYPE_p_f_float__float function) : this(NDalicPINVOKE.new_AlphaFunction__SWIG_2(SWIGTYPE_p_f_float__float.getCPtr(function)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -73,7 +73,7 @@ public class AlphaFunction : global::System.IDisposable { return ret; } - public SWIGTYPE_p_f_float__float GetCustomFunction() { + internal SWIGTYPE_p_f_float__float GetCustomFunction() { global::System.IntPtr cPtr = NDalicPINVOKE.AlphaFunction_GetCustomFunction(swigCPtr); SWIGTYPE_p_f_float__float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_float__float(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -111,7 +111,8 @@ public class AlphaFunction : global::System.IDisposable { } public enum Mode { - CustomFunction = 1, + BuiltinFunction, + CustomFunction, Bezier } diff --git a/plugins/dali-sharp/sharp/internal/AngleAxis.cs b/plugins/dali-sharp/sharp/public/AngleAxis.cs similarity index 98% rename from plugins/dali-sharp/sharp/internal/AngleAxis.cs rename to plugins/dali-sharp/sharp/public/AngleAxis.cs index ca51c8d..59c7587 100644 --- a/plugins/dali-sharp/sharp/internal/AngleAxis.cs +++ b/plugins/dali-sharp/sharp/public/AngleAxis.cs @@ -54,7 +54,7 @@ public class AngleAxis : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Radian angle { + public Radian Angle { set { NDalicPINVOKE.AngleAxis_angle_set(swigCPtr, Radian.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -67,7 +67,7 @@ public class AngleAxis : global::System.IDisposable { } } - public Vector3 axis { + public Vector3 Axis { set { NDalicPINVOKE.AngleAxis_axis_set(swigCPtr, Vector3.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/Animatable.cs b/plugins/dali-sharp/sharp/public/Animatable.cs similarity index 79% rename from plugins/dali-sharp/sharp/internal/Animatable.cs rename to plugins/dali-sharp/sharp/public/Animatable.cs index 95d7e3b..7abd0da 100644 --- a/plugins/dali-sharp/sharp/internal/Animatable.cs +++ b/plugins/dali-sharp/sharp/public/Animatable.cs @@ -55,17 +55,8 @@ public class Animatable : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Animatable(Animatable handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Animatable.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public bool Supports(Animatable.Capability capability) { - bool ret = NDalicPINVOKE.Handle_Supports(swigCPtr, (int)capability); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public uint GetPropertyCount() { + internal uint GetPropertyCount() { uint ret = NDalicPINVOKE.Handle_GetPropertyCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -95,12 +86,6 @@ public class Animatable : BaseHandle { return ret; } - public bool IsPropertyAConstraintInput(int index) { - bool ret = NDalicPINVOKE.Handle_IsPropertyAConstraintInput(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public Property.Type GetPropertyType(int index) { Property.Type ret = (Property.Type)NDalicPINVOKE.Handle_GetPropertyType(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -130,39 +115,34 @@ public class Animatable : BaseHandle { return ret; } - public void GetPropertyIndices(VectorInteger indices) { - NDalicPINVOKE.Handle_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PropertyNotification AddPropertyNotification(int index, PropertyCondition condition) { + internal PropertyNotification AddPropertyNotification(int index, PropertyCondition condition) { PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_0(swigCPtr, index, PropertyCondition.getCPtr(condition)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition) { + internal PropertyNotification AddPropertyNotification(int index, int componentIndex, PropertyCondition condition) { PropertyNotification ret = new PropertyNotification(NDalicPINVOKE.Handle_AddPropertyNotification__SWIG_1(swigCPtr, index, componentIndex, PropertyCondition.getCPtr(condition)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void RemovePropertyNotification(PropertyNotification propertyNotification) { + internal void RemovePropertyNotification(PropertyNotification propertyNotification) { NDalicPINVOKE.Handle_RemovePropertyNotification(swigCPtr, PropertyNotification.getCPtr(propertyNotification)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemovePropertyNotifications() { + internal void RemovePropertyNotifications() { NDalicPINVOKE.Handle_RemovePropertyNotifications(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveConstraints() { + internal void RemoveConstraints() { NDalicPINVOKE.Handle_RemoveConstraints__SWIG_0(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveConstraints(uint tag) { + internal void RemoveConstraints(uint tag) { NDalicPINVOKE.Handle_RemoveConstraints__SWIG_1(swigCPtr, tag); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/Animation.cs b/plugins/dali-sharp/sharp/public/Animation.cs similarity index 95% rename from plugins/dali-sharp/sharp/internal/Animation.cs rename to plugins/dali-sharp/sharp/public/Animation.cs index 6eb45fb..bafdaf2 100644 --- a/plugins/dali-sharp/sharp/internal/Animation.cs +++ b/plugins/dali-sharp/sharp/public/Animation.cs @@ -528,20 +528,6 @@ namespace Dali } - public static Animation DownCast(BaseHandle handle) - { - Animation ret = new Animation(NDalicPINVOKE.Animation_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Animation(Animation handle) : this(NDalicPINVOKE.new_Animation__SWIG_1(Animation.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public Animation Assign(Animation rhs) { Animation ret = new Animation(NDalicPINVOKE.Animation_Assign(swigCPtr, Animation.getCPtr(rhs)), false); @@ -550,14 +536,14 @@ namespace Dali return ret; } - public void SetDuration(float seconds) + internal void SetDuration(float seconds) { NDalicPINVOKE.Animation_SetDuration(swigCPtr, seconds); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float GetDuration() + internal float GetDuration() { float ret = NDalicPINVOKE.Animation_GetDuration(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -565,21 +551,21 @@ namespace Dali return ret; } - public void SetLooping(bool looping) + internal void SetLooping(bool looping) { NDalicPINVOKE.Animation_SetLooping(swigCPtr, looping); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetLoopCount(int count) + internal void SetLoopCount(int count) { NDalicPINVOKE.Animation_SetLoopCount(swigCPtr, count); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public int GetLoopCount() + internal int GetLoopCount() { int ret = NDalicPINVOKE.Animation_GetLoopCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -595,7 +581,7 @@ namespace Dali return ret; } - public bool IsLooping() + internal bool IsLooping() { bool ret = NDalicPINVOKE.Animation_IsLooping(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -603,14 +589,14 @@ namespace Dali return ret; } - public void SetEndAction(Animation.EndActions action) + internal void SetEndAction(Animation.EndActions action) { NDalicPINVOKE.Animation_SetEndAction(swigCPtr, (int)action); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Animation.EndActions GetEndAction() + internal Animation.EndActions GetEndAction() { Animation.EndActions ret = (Animation.EndActions)NDalicPINVOKE.Animation_GetEndAction(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -633,14 +619,14 @@ namespace Dali return ret; } - public void SetDefaultAlphaFunction(AlphaFunction alpha) + internal void SetDefaultAlphaFunction(AlphaFunction alpha) { NDalicPINVOKE.Animation_SetDefaultAlphaFunction(swigCPtr, AlphaFunction.getCPtr(alpha)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public AlphaFunction GetDefaultAlphaFunction() + internal AlphaFunction GetDefaultAlphaFunction() { AlphaFunction ret = new AlphaFunction(NDalicPINVOKE.Animation_GetDefaultAlphaFunction(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -714,7 +700,7 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Animation.State GetState() + private Animation.State GetState() { Animation.State ret = (Animation.State)NDalicPINVOKE.Animation_GetState(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -736,7 +722,7 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public AnimationSignal FinishedSignal() + internal AnimationSignal FinishedSignal() { AnimationSignal ret = new AnimationSignal(NDalicPINVOKE.Animation_FinishedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -884,20 +870,6 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Show(View view, float delaySeconds) - { - NDalicPINVOKE.Animation_Show(swigCPtr, View.getCPtr(view), delaySeconds); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void Hide(View view, float delaySeconds) - { - NDalicPINVOKE.Animation_Hide(swigCPtr, View.getCPtr(view), delaySeconds); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public enum EndActions { Cancel, diff --git a/plugins/dali-sharp/sharp/internal/Application.cs b/plugins/dali-sharp/sharp/public/Application.cs similarity index 96% rename from plugins/dali-sharp/sharp/internal/Application.cs rename to plugins/dali-sharp/sharp/public/Application.cs index d07c886..0b2e5e5 100644 --- a/plugins/dali-sharp/sharp/internal/Application.cs +++ b/plugins/dali-sharp/sharp/public/Application.cs @@ -1032,16 +1032,16 @@ public class Application : BaseHandle { } public static Application NewApplication() { - _instance = NewApplication("", Application.WINDOW_MODE.OPAQUE); + _instance = NewApplication("", Application.WindowMode.Opaque); return _instance; } public static Application NewApplication(string stylesheet) { - _instance = NewApplication(stylesheet, Application.WINDOW_MODE.OPAQUE); + _instance = NewApplication(stylesheet, Application.WindowMode.Opaque); return _instance; } - public static Application NewApplication(string stylesheet, Application.WINDOW_MODE windowMode) { + public static Application NewApplication(string stylesheet, Application.WindowMode windowMode) { // register all Views with the type registry, so that can be created / styled via JSON ViewRegistryHelper.Initialize(); @@ -1079,7 +1079,7 @@ public class Application : BaseHandle { return ret; } - public static Application New(int argc, string stylesheet, Application.WINDOW_MODE windowMode) { + public static Application New(int argc, string stylesheet, Application.WindowMode windowMode) { Application ret = new Application(NDalicPINVOKE.Application_New__SWIG_3(argc, stylesheet, (int)windowMode), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -1089,22 +1089,12 @@ public class Application : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Application(Application application) : this(NDalicPINVOKE.new_Application__SWIG_1(Application.getCPtr(application)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Application Assign(Application application) { - Application ret = new Application(NDalicPINVOKE.Application_Assign(swigCPtr, Application.getCPtr(application)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void MainLoop() { NDalicPINVOKE.Application_MainLoop__SWIG_0(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void MainLoop(SWIGTYPE_p_Configuration__ContextLoss configuration) { + internal void MainLoop(SWIGTYPE_p_Configuration__ContextLoss configuration) { NDalicPINVOKE.Application_MainLoop__SWIG_1(swigCPtr, SWIGTYPE_p_Configuration__ContextLoss.getCPtr(configuration)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1119,7 +1109,7 @@ public class Application : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool AddIdle(SWIGTYPE_p_Dali__CallbackBase callback) { + internal bool AddIdle(SWIGTYPE_p_Dali__CallbackBase callback) { bool ret = NDalicPINVOKE.Application_AddIdle(swigCPtr, SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -1142,12 +1132,12 @@ public class Application : BaseHandle { return ret; } - public void SetViewMode(ViewMode viewMode) { + internal void SetViewMode(ViewMode viewMode) { NDalicPINVOKE.Application_SetViewMode(swigCPtr, (int)viewMode); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ViewMode GetViewMode() { + internal ViewMode GetViewMode() { ViewMode ret = (ViewMode)NDalicPINVOKE.Application_GetViewMode(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -1164,75 +1154,75 @@ public class Application : BaseHandle { return ret; } - public ApplicationSignal InitSignal() { + internal ApplicationSignal InitSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_InitSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal TerminateSignal() { + internal ApplicationSignal TerminateSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_TerminateSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal PauseSignal() { + internal ApplicationSignal PauseSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_PauseSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal ResumeSignal() { + internal ApplicationSignal ResumeSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResumeSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal ResetSignal() { + internal ApplicationSignal ResetSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResetSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal ResizeSignal() { + internal ApplicationSignal ResizeSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_ResizeSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationControlSignal AppControlSignal() { + internal ApplicationControlSignal AppControlSignal() { ApplicationControlSignal ret = new ApplicationControlSignal(NDalicPINVOKE.Application_AppControlSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal LanguageChangedSignal() { + internal ApplicationSignal LanguageChangedSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_LanguageChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal RegionChangedSignal() { + internal ApplicationSignal RegionChangedSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_RegionChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal BatteryLowSignal() { + internal ApplicationSignal BatteryLowSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_BatteryLowSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ApplicationSignal MemoryLowSignal() { + internal ApplicationSignal MemoryLowSignal() { ApplicationSignal ret = new ApplicationSignal(NDalicPINVOKE.Application_MemoryLowSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum WINDOW_MODE { - OPAQUE = 0, - TRANSPARENT = 1 + public enum WindowMode { + Opaque = 0, + Transparent = 1 } } diff --git a/plugins/dali-sharp/sharp/internal/BaseHandle.cs b/plugins/dali-sharp/sharp/public/BaseHandle.cs similarity index 89% rename from plugins/dali-sharp/sharp/internal/BaseHandle.cs rename to plugins/dali-sharp/sharp/public/BaseHandle.cs index 8420649..412e1db 100644 --- a/plugins/dali-sharp/sharp/internal/BaseHandle.cs +++ b/plugins/dali-sharp/sharp/public/BaseHandle.cs @@ -157,11 +157,6 @@ public class BaseHandle : global::System.IDisposable { return true; } - - public BaseHandle(BaseObject handle) : this(NDalicPINVOKE.new_BaseHandle__SWIG_0(BaseObject.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public BaseHandle() : this(NDalicPINVOKE.new_BaseHandle__SWIG_1(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -170,12 +165,6 @@ public class BaseHandle : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public BaseHandle Assign(BaseHandle rhs) { - BaseHandle ret = new BaseHandle(NDalicPINVOKE.BaseHandle_Assign(swigCPtr, BaseHandle.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public bool DoAction(string actionName, Property.Map attributes) { bool ret = NDalicPINVOKE.BaseHandle_DoAction(swigCPtr, actionName, Property.Map.getCPtr(attributes)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -194,12 +183,6 @@ public class BaseHandle : global::System.IDisposable { return ret; } - public BaseObject GetBaseObject() { - BaseObject ret = new BaseObject(NDalicPINVOKE.BaseHandle_GetBaseObject__SWIG_0(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void Reset() { NDalicPINVOKE.BaseHandle_Reset(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -217,7 +200,7 @@ public class BaseHandle : global::System.IDisposable { return ret; } - public RefObject GetObjectPtr() { + internal RefObject GetObjectPtr() { global::System.IntPtr cPtr = NDalicPINVOKE.BaseHandle_GetObjectPtr(swigCPtr); RefObject ret = (cPtr == global::System.IntPtr.Zero) ? null : new RefObject(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/Button.cs b/plugins/dali-sharp/sharp/public/Button.cs similarity index 70% rename from plugins/dali-sharp/sharp/internal/Button.cs rename to plugins/dali-sharp/sharp/public/Button.cs index d785260..d34f222 100644 --- a/plugins/dali-sharp/sharp/internal/Button.cs +++ b/plugins/dali-sharp/sharp/public/Button.cs @@ -327,7 +327,7 @@ public class StateChangedEventArgs : EventArgs return false; } - public static Button GetButtonFromPtr(global::System.IntPtr cPtr) { + internal static Button GetButtonFromPtr(global::System.IntPtr cPtr) { Button ret = new Button(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -473,50 +473,22 @@ public class StateChangedEventArgs : EventArgs } } - public Vector4 VisualPadding + public Vector4 ForegroundVisualPadding { get { Vector4 temp = new Vector4(0.0f,0.0f,0.0f,0.0f); - GetProperty( Button.Property.VISUAL_PADDING).Get( temp ); + GetProperty( Button.Property.FOREGROUND_VISUAL_PADDING).Get( temp ); return temp; } set { - SetProperty( Button.Property.VISUAL_PADDING, new Dali.Property.Value( value ) ); + SetProperty( Button.Property.FOREGROUND_VISUAL_PADDING, new Dali.Property.Value( value ) ); } } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_Button_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - + public class Property + { public static readonly int UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_VISUAL_get(); public static readonly int SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_VISUAL_get(); public static readonly int DISABLED_SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_VISUAL_get(); @@ -527,26 +499,16 @@ public class StateChangedEventArgs : EventArgs public static readonly int DISABLED_SELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_BACKGROUND_VISUAL_get(); public static readonly int LABEL_RELATIVE_ALIGNMENT = NDalicManualPINVOKE.Button_Property_LABEL_RELATIVE_ALIGNMENT_get(); public static readonly int LABEL_PADDING = NDalicManualPINVOKE.Button_Property_LABEL_PADDING_get(); - public static readonly int VISUAL_PADDING = NDalicManualPINVOKE.Button_Property_VISUAL_PADDING_get(); - - public Property() : this(NDalicPINVOKE.new_Button_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static readonly int DISABLED = NDalicPINVOKE.Button_Property_DISABLED_get(); + public static readonly int FOREGROUND_VISUAL_PADDING = NDalicManualPINVOKE.Button_Property_VISUAL_PADDING_get(); + public static readonly int AUTO_REPEATING = NDalicPINVOKE.Button_Property_AUTO_REPEATING_get(); public static readonly int INITIAL_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_INITIAL_AUTO_REPEATING_DELAY_get(); public static readonly int NEXT_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_NEXT_AUTO_REPEATING_DELAY_get(); public static readonly int TOGGLABLE = NDalicPINVOKE.Button_Property_TOGGLABLE_get(); public static readonly int SELECTED = NDalicPINVOKE.Button_Property_SELECTED_get(); - public static readonly int UNSELECTED_STATE_IMAGE = NDalicPINVOKE.Button_Property_UNSELECTED_STATE_IMAGE_get(); - public static readonly int SELECTED_STATE_IMAGE = NDalicPINVOKE.Button_Property_SELECTED_STATE_IMAGE_get(); - public static readonly int DISABLED_STATE_IMAGE = NDalicPINVOKE.Button_Property_DISABLED_STATE_IMAGE_get(); public static readonly int UNSELECTED_COLOR = NDalicPINVOKE.Button_Property_UNSELECTED_COLOR_get(); public static readonly int SELECTED_COLOR = NDalicPINVOKE.Button_Property_SELECTED_COLOR_get(); public static readonly int LABEL = NDalicPINVOKE.Button_Property_LABEL_get(); - public static readonly int LABEL_TEXT = NDalicPINVOKE.Button_Property_LABEL_TEXT_get(); - } public Button() : this(NDalicPINVOKE.new_Button__SWIG_0(), true) { @@ -557,141 +519,42 @@ public class StateChangedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Button Assign(Button button) { - Button ret = new Button(NDalicPINVOKE.Button_Assign(swigCPtr, Button.getCPtr(button)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public new static Button DownCast(BaseHandle handle) { Button ret = new Button(NDalicPINVOKE.Button_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool IsDisabled() { - bool ret = NDalicPINVOKE.Button_IsDisabled(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public bool IsAutoRepeating() { - bool ret = NDalicPINVOKE.Button_IsAutoRepeating(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public float GetInitialAutoRepeatingDelay() { - float ret = NDalicPINVOKE.Button_GetInitialAutoRepeatingDelay(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public float GetNextAutoRepeatingDelay() { - float ret = NDalicPINVOKE.Button_GetNextAutoRepeatingDelay(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public bool IsTogglableButton() { - bool ret = NDalicPINVOKE.Button_IsTogglableButton(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public bool IsSelected() { - bool ret = NDalicPINVOKE.Button_IsSelected(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public float GetAnimationTime() { - float ret = NDalicPINVOKE.Button_GetAnimationTime(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public string GetLabelText() { - string ret = NDalicPINVOKE.Button_GetLabelText(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetLabel(View label) { - NDalicPINVOKE.Button_SetLabel(swigCPtr, View.getCPtr(label)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetButtonImage(Image image) { - NDalicPINVOKE.Button_SetButtonImage(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetSelectedImage(Image image) { - NDalicPINVOKE.Button_SetSelectedImage(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public View GetButtonImage() { - View ret = new View(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public View GetSelectedImage() { - View ret = new View(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public ButtonSignal PressedSignal() { + internal ButtonSignal PressedSignal() { ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_PressedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ButtonSignal ReleasedSignal() { + internal ButtonSignal ReleasedSignal() { ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ReleasedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ButtonSignal ClickedSignal() { + internal ButtonSignal ClickedSignal() { ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_ClickedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ButtonSignal StateChangedSignal() { + internal ButtonSignal StateChangedSignal() { ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_StateChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - - public bool Disabled - { - get - { - bool temp = false; - GetProperty( Button.Property.DISABLED).Get( ref temp ); - return temp; - } - set - { - SetProperty( Button.Property.DISABLED, new Dali.Property.Value( value ) ); - } - } public bool AutoRepeating { get { bool temp = false; - GetProperty( Button.Property.AUTO_REPEATING).Get( ref temp ); + GetProperty( Button.Property.AUTO_REPEATING).Get( out temp ); return temp; } set @@ -704,7 +567,7 @@ public class StateChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get( ref temp ); + GetProperty( Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get( out temp ); return temp; } set @@ -717,7 +580,7 @@ public class StateChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( Button.Property.NEXT_AUTO_REPEATING_DELAY).Get( ref temp ); + GetProperty( Button.Property.NEXT_AUTO_REPEATING_DELAY).Get( out temp ); return temp; } set @@ -730,7 +593,7 @@ public class StateChangedEventArgs : EventArgs get { bool temp = false; - GetProperty( Button.Property.TOGGLABLE).Get( ref temp ); + GetProperty( Button.Property.TOGGLABLE).Get( out temp ); return temp; } set @@ -743,7 +606,7 @@ public class StateChangedEventArgs : EventArgs get { bool temp = false; - GetProperty( Button.Property.SELECTED).Get( ref temp ); + GetProperty( Button.Property.SELECTED).Get( out temp ); return temp; } set @@ -751,45 +614,6 @@ public class StateChangedEventArgs : EventArgs SetProperty( Button.Property.SELECTED, new Dali.Property.Value( value ) ); } } - public Dali.Property.Map UnselectedStateImage - { - get - { - Dali.Property.Map temp = new Dali.Property.Map(); - GetProperty( Button.Property.UNSELECTED_STATE_IMAGE).Get( temp ); - return temp; - } - set - { - SetProperty( Button.Property.UNSELECTED_STATE_IMAGE, new Dali.Property.Value( value ) ); - } - } - public Dali.Property.Map SelectedStateImage - { - get - { - Dali.Property.Map temp = new Dali.Property.Map(); - GetProperty( Button.Property.SELECTED_STATE_IMAGE).Get( temp ); - return temp; - } - set - { - SetProperty( Button.Property.SELECTED_STATE_IMAGE, new Dali.Property.Value( value ) ); - } - } - public Dali.Property.Map DisabledStateImage - { - get - { - Dali.Property.Map temp = new Dali.Property.Map(); - GetProperty( Button.Property.DISABLED_STATE_IMAGE).Get( temp ); - return temp; - } - set - { - SetProperty( Button.Property.DISABLED_STATE_IMAGE, new Dali.Property.Value( value ) ); - } - } public Vector4 UnselectedColor { get @@ -833,13 +657,16 @@ public class StateChangedEventArgs : EventArgs { get { - string temp; - GetProperty( Button.Property.LABEL_TEXT).Get( out temp ); - return temp; + Dali.Property.Map map = new Dali.Property.Map(); + GetProperty( Button.Property.LABEL).Get(map); + Dali.Property.Value value = map.Find( Dali.Constants.TextVisualProperty.Text, "Text"); + string str; + value.Get(out str); + return str; } set { - SetProperty( Button.Property.LABEL_TEXT, new Dali.Property.Value( value ) ); + SetProperty( Button.Property.LABEL, new Dali.Property.Value( value ) ); } } diff --git a/plugins/dali-sharp/sharp/internal/CheckBoxButton.cs b/plugins/dali-sharp/sharp/public/CheckBoxButton.cs similarity index 81% rename from plugins/dali-sharp/sharp/internal/CheckBoxButton.cs rename to plugins/dali-sharp/sharp/public/CheckBoxButton.cs index 289d059..9930c37 100644 --- a/plugins/dali-sharp/sharp/internal/CheckBoxButton.cs +++ b/plugins/dali-sharp/sharp/public/CheckBoxButton.cs @@ -65,17 +65,8 @@ public class CheckBoxButton : Button { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public CheckBoxButton(CheckBoxButton checkBox) : this(NDalicPINVOKE.new_CheckBoxButton__SWIG_1(CheckBoxButton.getCPtr(checkBox)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public CheckBoxButton Assign(CheckBoxButton checkBox) { - CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_Assign(swigCPtr, CheckBoxButton.getCPtr(checkBox)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public new static CheckBoxButton DownCast(BaseHandle handle) { + internal new static CheckBoxButton DownCast(BaseHandle handle) { CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/Color.cs b/plugins/dali-sharp/sharp/public/Color.cs similarity index 99% rename from plugins/dali-sharp/sharp/internal/Color.cs rename to plugins/dali-sharp/sharp/public/Color.cs index 6b1c59a..e3aef1b 100755 --- a/plugins/dali-sharp/sharp/internal/Color.cs +++ b/plugins/dali-sharp/sharp/public/Color.cs @@ -92,7 +92,7 @@ public class Color : global::System.IDisposable { } } - public static Color GetColorFromPtr(global::System.IntPtr cPtr) { + internal static Color GetColorFromPtr(global::System.IntPtr cPtr) { Color ret = new Color(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -347,7 +347,7 @@ public class Color : global::System.IDisposable { public static implicit operator Color(Vector4 vec) { - return new Color(vec.r, vec.g, vec.b, vec.a); + return new Color(vec.R, vec.G, vec.B, vec.A); } } diff --git a/plugins/dali-sharp/sharp/internal/CustomView.cs b/plugins/dali-sharp/sharp/public/CustomView.cs similarity index 93% rename from plugins/dali-sharp/sharp/internal/CustomView.cs rename to plugins/dali-sharp/sharp/public/CustomView.cs index 9811515..8f9d49f 100644 --- a/plugins/dali-sharp/sharp/internal/CustomView.cs +++ b/plugins/dali-sharp/sharp/public/CustomView.cs @@ -19,7 +19,7 @@ namespace Dali { public class CustomView : ViewWrapper { - public CustomView(string typeName, ViewWrapperImpl.CustomViewBehaviour behaviour) : base(typeName, new ViewWrapperImpl(behaviour)) + public CustomView(string typeName, CustomViewBehaviour behaviour) : base(typeName, new ViewWrapperImpl(behaviour)) { // Registering CustomView virtual functions to viewWrapperImpl delegates. viewWrapperImpl.OnStageConnection = new ViewWrapperImpl.OnStageConnectionDelegate(OnStageConnection); @@ -51,11 +51,11 @@ namespace Dali viewWrapperImpl.OnAccessibilityTouch = new ViewWrapperImpl.OnAccessibilityTouchDelegate(OnAccessibilityTouch); viewWrapperImpl.OnAccessibilityValueChange = new ViewWrapperImpl.OnAccessibilityValueChangeDelegate(OnAccessibilityValueChange); viewWrapperImpl.OnAccessibilityZoom = new ViewWrapperImpl.OnAccessibilityZoomDelegate(OnAccessibilityZoom); - viewWrapperImpl.OnKeyInputFocusGained = new ViewWrapperImpl.OnKeyInputFocusGainedDelegate(OnKeyInputFocusGained); - viewWrapperImpl.OnKeyInputFocusLost = new ViewWrapperImpl.OnKeyInputFocusLostDelegate(OnKeyInputFocusLost); - viewWrapperImpl.GetNextKeyboardFocusableActor = new ViewWrapperImpl.GetNextKeyboardFocusableActorDelegate(GetNextKeyboardFocusableView); - viewWrapperImpl.OnKeyboardFocusChangeCommitted = new ViewWrapperImpl.OnKeyboardFocusChangeCommittedDelegate(OnKeyboardFocusChangeCommitted); - viewWrapperImpl.OnKeyboardEnter = new ViewWrapperImpl.OnKeyboardEnterDelegate(OnKeyboardEnter); + viewWrapperImpl.OnFocusGained = new ViewWrapperImpl.OnFocusGainedDelegate(OnFocusGained); + viewWrapperImpl.OnFocusLost = new ViewWrapperImpl.OnFocusLostDelegate(OnFocusLost); + viewWrapperImpl.GetNextFocusableActor = new ViewWrapperImpl.GetNextFocusableActorDelegate(GetNextFocusableView); + viewWrapperImpl.OnFocusChangeCommitted = new ViewWrapperImpl.OnFocusChangeCommittedDelegate(OnFocusChangeCommitted); + viewWrapperImpl.OnFocusEnter = new ViewWrapperImpl.OnFocusEnterDelegate(OnFocusEnter); viewWrapperImpl.OnPinch = new ViewWrapperImpl.OnPinchDelegate(OnPinch); viewWrapperImpl.OnPan = new ViewWrapperImpl.OnPanDelegate(OnPan); viewWrapperImpl.OnTap = new ViewWrapperImpl.OnTapDelegate(OnTap); @@ -117,9 +117,9 @@ namespace Dali * The control doesn't support it by default. * @param[in] isSupported Whether this control supports two dimensional keyboard navigation. */ - public void SetKeyboardNavigationSupport(bool isSupported) + public void SetFocusNavigationSupport(bool isSupported) { - viewWrapperImpl.SetKeyboardNavigationSupport(isSupported); + viewWrapperImpl.SetFocusNavigationSupport(isSupported); } /** @@ -127,9 +127,9 @@ namespace Dali * * @return true if this control supports two dimensional keyboard navigation. */ - public bool IsKeyboardNavigationSupported() + public bool IsFocusNavigationSupported() { - return viewWrapperImpl.IsKeyboardNavigationSupported(); + return viewWrapperImpl.IsFocusNavigationSupported(); } /** @@ -139,9 +139,9 @@ namespace Dali * can be limitied to its child views). The control is not a focus group by default. * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation. */ - public void SetAsKeyboardFocusGroup(bool isFocusGroup) + public void SetAsFocusGroup(bool isFocusGroup) { - viewWrapperImpl.SetAsKeyboardFocusGroup(isFocusGroup); + viewWrapperImpl.SetAsFocusGroup(isFocusGroup); } /** @@ -149,9 +149,9 @@ namespace Dali * * @return true if this control is set as a focus group for keyboard navigation. */ - public bool IsKeyboardFocusGroup() + public bool IsFocusGroup() { - return viewWrapperImpl.IsKeyboardFocusGroup(); + return viewWrapperImpl.IsFocusGroup(); } /** @@ -166,9 +166,9 @@ namespace Dali /** * @brief Called by the KeyboardFocusManager. */ - public void KeyboardEnter() + public void FocusEnter() { - viewWrapperImpl.KeyboardEnter(); + viewWrapperImpl.FocusEnter(); } /** @@ -177,7 +177,7 @@ namespace Dali * @param[in] key The key event. * @return True if the event was consumed. */ - public bool EmitKeyEventSignal(Key key) + internal bool EmitKeyEventSignal(Key key) { return viewWrapperImpl.EmitKeyEventSignal(key); } @@ -345,9 +345,9 @@ namespace Dali * * @param[in] focusGained True if gained, False if lost */ - protected void EmitKeyInputFocusSignal(bool focusGained) + protected void EmitFocusSignal(bool focusGained) { - viewWrapperImpl.EmitKeyInputFocusSignal( focusGained ); + viewWrapperImpl.EmitFocusSignal( focusGained ); } /** @@ -639,7 +639,7 @@ namespace Dali * Derived classes should override this to perform custom accessibility activation. * @return true if this control can perform accessibility activation. */ - public virtual bool OnAccessibilityActivated() + internal virtual bool OnAccessibilityActivated() { return false; } @@ -651,7 +651,7 @@ namespace Dali * @param[in] gesture The pan gesture. * @return true if the pan gesture has been consumed by this control */ - public virtual bool OnAccessibilityPan(PanGesture gestures) + internal virtual bool OnAccessibilityPan(PanGesture gestures) { return false; } @@ -663,7 +663,7 @@ namespace Dali * @param[in] touch The touch event. * @return true if the touch event has been consumed by this control */ - public virtual bool OnAccessibilityTouch(Touch touch) + internal virtual bool OnAccessibilityTouch(Touch touch) { return false; } @@ -675,7 +675,7 @@ namespace Dali * @param[in] isIncrease Whether the value should be increased or decreased * @return true if the value changed action has been consumed by this control */ - public virtual bool OnAccessibilityValueChange(bool isIncrease) + internal virtual bool OnAccessibilityValueChange(bool isIncrease) { return false; } @@ -686,7 +686,7 @@ namespace Dali * * @return true if the zoom action has been consumed by this control */ - public virtual bool OnAccessibilityZoom() + internal virtual bool OnAccessibilityZoom() { return false; } @@ -697,7 +697,7 @@ namespace Dali * * @return true if the zoom action has been consumed by this control */ - public virtual void OnKeyInputFocusGained() + public virtual void OnFocusGained() { } @@ -706,7 +706,7 @@ namespace Dali * * Should be overridden by derived classes if they need to customize what happens when focus is lost. */ - public virtual void OnKeyInputFocusLost() + public virtual void OnFocusLost() { } @@ -719,7 +719,7 @@ namespace Dali * @param[in] loopEnabled Whether the focus movement should be looped within the view. * @return the next keyboard focusable view in this control or an empty handle if no view can be focused. */ - public virtual View GetNextKeyboardFocusableView(View currentFocusedView, View.KeyboardFocus.Direction direction, bool loopEnabled) + public virtual View GetNextFocusableView(View currentFocusedView, View.Focus.Direction direction, bool loopEnabled) { return new View(); } @@ -732,7 +732,7 @@ namespace Dali * * @param[in] commitedFocusableView The commited focusable view. */ - public virtual void OnKeyboardFocusChangeCommitted(View commitedFocusableView) + public virtual void OnFocusChangeCommitted(View commitedFocusableView) { } @@ -742,7 +742,7 @@ namespace Dali * Derived classes should override this to perform custom actions. * @return true if this control supported this action. */ - public virtual bool OnKeyboardEnter() + public virtual bool OnFocusEnter() { return false; } @@ -816,4 +816,13 @@ namespace Dali { } } + + public enum CustomViewBehaviour + { + VIEW_BEHAVIOUR_DEFAULT = 0, + DISABLE_SIZE_NEGOTIATION = 1 << 0, + REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << 5, + DISABLE_STYLE_CHANGE_SIGNALS = 1 << 6, + LAST_VIEW_BEHAVIOUR_FLAG + } } diff --git a/plugins/dali-sharp/sharp/internal/Degree.cs b/plugins/dali-sharp/sharp/public/Degree.cs similarity index 99% rename from plugins/dali-sharp/sharp/internal/Degree.cs rename to plugins/dali-sharp/sharp/public/Degree.cs index c47993c..4bb917e 100644 --- a/plugins/dali-sharp/sharp/internal/Degree.cs +++ b/plugins/dali-sharp/sharp/public/Degree.cs @@ -58,7 +58,7 @@ public class Degree : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float degree { + public float Value { set { NDalicPINVOKE.Degree_degree_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/DimensionType.cs b/plugins/dali-sharp/sharp/public/DimensionType.cs similarity index 89% rename from plugins/dali-sharp/sharp/internal/DimensionType.cs rename to plugins/dali-sharp/sharp/public/DimensionType.cs index 5fa5c34..048eabc 100644 --- a/plugins/dali-sharp/sharp/internal/DimensionType.cs +++ b/plugins/dali-sharp/sharp/public/DimensionType.cs @@ -11,9 +11,9 @@ namespace Dali { public enum DimensionType { - WIDTH = 0x1, - HEIGHT = 0x2, - ALL_DIMENSIONS = 0x3 + Width = 0x1, + Height = 0x2, + AllDimensions = 0x3 } } diff --git a/plugins/dali-sharp/sharp/internal/DirectionBias.cs b/plugins/dali-sharp/sharp/public/DirectionBias.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/DirectionBias.cs rename to plugins/dali-sharp/sharp/public/DirectionBias.cs diff --git a/plugins/dali-sharp/sharp/internal/DirectionType.cs b/plugins/dali-sharp/sharp/public/DirectionType.cs similarity index 92% rename from plugins/dali-sharp/sharp/internal/DirectionType.cs rename to plugins/dali-sharp/sharp/public/DirectionType.cs index ca3c301..88641f9 100644 --- a/plugins/dali-sharp/sharp/internal/DirectionType.cs +++ b/plugins/dali-sharp/sharp/public/DirectionType.cs @@ -11,8 +11,8 @@ namespace Dali { public enum DirectionType { - LEFT_TO_RIGHT = 0, - RIGHT_TO_LEFT + LeftToRight = 0, + RightToLeft } } diff --git a/plugins/dali-sharp/sharp/internal/DrawModeType.cs b/plugins/dali-sharp/sharp/public/DrawModeType.cs similarity index 90% rename from plugins/dali-sharp/sharp/internal/DrawModeType.cs rename to plugins/dali-sharp/sharp/public/DrawModeType.cs index 457ef90..46b9df8 100644 --- a/plugins/dali-sharp/sharp/internal/DrawModeType.cs +++ b/plugins/dali-sharp/sharp/public/DrawModeType.cs @@ -11,9 +11,9 @@ namespace Dali { public enum DrawModeType { - NORMAL = 0, - OVERLAY_2D = 1, - STENCIL = 3 + Normal = 0, + Overlay2D = 1, + Stencil = 3 } } diff --git a/plugins/dali-sharp/sharp/internal/FlexContainer.cs b/plugins/dali-sharp/sharp/public/FlexContainer.cs similarity index 55% rename from plugins/dali-sharp/sharp/internal/FlexContainer.cs rename to plugins/dali-sharp/sharp/public/FlexContainer.cs index 902ed78..807e61d 100644 --- a/plugins/dali-sharp/sharp/internal/FlexContainer.cs +++ b/plugins/dali-sharp/sharp/public/FlexContainer.cs @@ -61,148 +61,66 @@ public class FlexContainer : View { } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_FlexContainer_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_FlexContainer_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get(); public static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get(); public static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get(); public static readonly int JUSTIFY_CONTENT = NDalicPINVOKE.FlexContainer_Property_JUSTIFY_CONTENT_get(); public static readonly int ALIGN_ITEMS = NDalicPINVOKE.FlexContainer_Property_ALIGN_ITEMS_get(); public static readonly int ALIGN_CONTENT = NDalicPINVOKE.FlexContainer_Property_ALIGN_CONTENT_get(); - } - public class ChildProperty : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~ChildProperty() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_FlexContainer_ChildProperty(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public ChildProperty() : this(NDalicPINVOKE.new_FlexContainer_ChildProperty(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class ChildProperty + { public static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get(); public static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get(); public static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get(); - } public FlexContainer () : this (NDalicPINVOKE.FlexContainer_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public FlexContainer(FlexContainer handle) : this(NDalicPINVOKE.new_FlexContainer__SWIG_1(FlexContainer.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public FlexContainer Assign(FlexContainer handle) { - FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_Assign(swigCPtr, FlexContainer.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static FlexContainer DownCast(BaseHandle handle) { + internal new static FlexContainer DownCast(BaseHandle handle) { FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } public enum FlexDirectionType { - COLUMN, - COLUMN_REVERSE, - ROW, - ROW_REVERSE + Column, + ColumnReverse, + Row, + RowReverse } public enum ContentDirectionType { - INHERIT, + Inherit, LTR, RTL } public enum Justification { - JUSTIFY_FLEX_START, - JUSTIFY_CENTER, - JUSTIFY_FLEX_END, - JUSTIFY_SPACE_BETWEEN, - JUSTIFY_SPACE_AROUND + JustifyFlexStart, + JustifyCenter, + JustifyFlexEnd, + JustifySpaceBetween, + JustifySpaceAround } public enum Alignment { - ALIGN_AUTO, - ALIGN_FLEX_START, - ALIGN_CENTER, - ALIGN_FLEX_END, - ALIGN_STRETCH + AlignAuto, + AlignFlexStart, + AlignCenter, + AlignFlexEnd, + AlignStretch } public enum WrapType { - NO_WRAP, - WRAP - } - - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX, - CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX+1000 + NoWrap, + Wrap } public int ContentDirection @@ -210,7 +128,7 @@ public class FlexContainer : View { get { int temp = 0; - GetProperty( FlexContainer.Property.CONTENT_DIRECTION).Get( ref temp ); + GetProperty( FlexContainer.Property.CONTENT_DIRECTION).Get( out temp ); return temp; } set @@ -223,7 +141,7 @@ public class FlexContainer : View { get { int temp = 0; - GetProperty( FlexContainer.Property.FLEX_DIRECTION).Get( ref temp ); + GetProperty( FlexContainer.Property.FLEX_DIRECTION).Get( out temp ); return temp; } set @@ -236,7 +154,7 @@ public class FlexContainer : View { get { int temp = 0; - GetProperty( FlexContainer.Property.FLEX_WRAP).Get( ref temp ); + GetProperty( FlexContainer.Property.FLEX_WRAP).Get( out temp ); return temp; } set @@ -249,7 +167,7 @@ public class FlexContainer : View { get { int temp = 0; - GetProperty( FlexContainer.Property.JUSTIFY_CONTENT).Get( ref temp ); + GetProperty( FlexContainer.Property.JUSTIFY_CONTENT).Get( out temp ); return temp; } set @@ -262,7 +180,7 @@ public class FlexContainer : View { get { int temp = 0; - GetProperty( FlexContainer.Property.ALIGN_ITEMS).Get( ref temp ); + GetProperty( FlexContainer.Property.ALIGN_ITEMS).Get( out temp ); return temp; } set @@ -275,7 +193,7 @@ public class FlexContainer : View { get { int temp = 0; - GetProperty( FlexContainer.Property.ALIGN_CONTENT).Get( ref temp ); + GetProperty( FlexContainer.Property.ALIGN_CONTENT).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/FocusManager.cs b/plugins/dali-sharp/sharp/public/FocusManager.cs similarity index 94% rename from plugins/dali-sharp/sharp/internal/FocusManager.cs rename to plugins/dali-sharp/sharp/public/FocusManager.cs index 2189b55..df7e0b6 100755 --- a/plugins/dali-sharp/sharp/internal/FocusManager.cs +++ b/plugins/dali-sharp/sharp/public/FocusManager.cs @@ -173,7 +173,7 @@ public class PreFocusChangeEventArgs : EventArgs { private View _current; private View _proposed; - private View.KeyboardFocus.Direction _direction; + private View.Focus.Direction _direction; /** * @brief Current - is the current focused View. @@ -211,7 +211,7 @@ public class PreFocusChangeEventArgs : EventArgs * @brief Direction - is the direction of Focus change. * */ - public View.KeyboardFocus.Direction Direction + public View.Focus.Direction Direction { get { @@ -237,7 +237,7 @@ public class PreFocusChangeEventArgs : EventArgs public delegate View PreFocusChangeEventHandler(object source, PreFocusChangeEventArgs e); [UnmanagedFunctionPointer(CallingConvention.StdCall)] - public delegate IntPtr PreFocusChangeEventCallbackDelegate(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction); + public delegate IntPtr PreFocusChangeEventCallbackDelegate(IntPtr current, IntPtr proposed, View.Focus.Direction direction); private PreFocusChangeEventHandler _FocusManagerPreFocusChangeEventHandler; private PreFocusChangeEventCallbackDelegate _FocusManagerPreFocusChangeEventCallbackDelegate; @@ -288,7 +288,7 @@ public class PreFocusChangeEventArgs : EventArgs } // Callback for FocusManager PreFocusChangeSignal - private IntPtr OnPreFocusChange(IntPtr current, IntPtr proposed, View.KeyboardFocus.Direction direction) + private IntPtr OnPreFocusChange(IntPtr current, IntPtr proposed, View.Focus.Direction direction) { View view = null; PreFocusChangeEventArgs e = new PreFocusChangeEventArgs(); @@ -427,11 +427,11 @@ public class PreFocusChangeEventArgs : EventArgs } /** - * @brief Event for FocusedViewEnterKeyPressed signal which can be used to subscribe/unsubscribe the event handler + * @brief Event for FocusedViewActivated signal which can be used to subscribe/unsubscribe the event handler * (in the type of FocusedViewEnterKeyEventHandler) provided by the user. - * FocusedViewEnterKeyPressed signal is emitted when the current focused view has the enter key pressed on it. + * FocusedViewActivated signal is emitted when the current focused view has the enter key pressed on it. */ - public event FocusedViewEnterKeyEventHandler FocusedViewEnterKeyPressed + internal event FocusedViewEnterKeyEventHandler FocusedViewActivated { add { @@ -442,7 +442,7 @@ public class PreFocusChangeEventArgs : EventArgs { _FocusManagerFocusedViewEnterKeyEventHandler += value; - _FocusManagerFocusedViewEnterKeyEventCallbackDelegate = new FocusedViewEnterKeyEventCallbackDelegate(OnFocusedViewEnterKey); + _FocusManagerFocusedViewEnterKeyEventCallbackDelegate = new FocusedViewEnterKeyEventCallbackDelegate(OnFocusedViewActivate); this.FocusedViewEnterKeySignal().Connect(_FocusManagerFocusedViewEnterKeyEventCallbackDelegate); } } @@ -463,7 +463,7 @@ public class PreFocusChangeEventArgs : EventArgs } // Callback for FocusManager FocusedViewEnterKeySignal - private void OnFocusedViewEnterKey(IntPtr view) + private void OnFocusedViewActivate(IntPtr view) { FocusedViewEnterKeyEventArgs e = new FocusedViewEnterKeyEventArgs(); @@ -481,7 +481,7 @@ public class PreFocusChangeEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static FocusManager Get() { + internal static FocusManager Get() { FocusManager ret = new FocusManager(NDalicManualPINVOKE.FocusManager_Get(), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -499,7 +499,7 @@ public class PreFocusChangeEventArgs : EventArgs return ret; } - public bool MoveFocus(View.KeyboardFocus.Direction direction) { + public bool MoveFocus(View.Focus.Direction direction) { bool ret = NDalicManualPINVOKE.FocusManager_MoveFocus(swigCPtr, (int)direction); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -557,25 +557,25 @@ public class PreFocusChangeEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PreFocusChangeSignal PreFocusChangeSignal() { + internal PreFocusChangeSignal PreFocusChangeSignal() { PreFocusChangeSignal ret = new PreFocusChangeSignal(NDalicManualPINVOKE.FocusManager_PreFocusChangeSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public FocusChangedSignal FocusChangedSignal() { + internal FocusChangedSignal FocusChangedSignal() { FocusChangedSignal ret = new FocusChangedSignal(NDalicManualPINVOKE.FocusManager_FocusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public FocusGroupChangedSignal FocusGroupChangedSignal() { + internal FocusGroupChangedSignal FocusGroupChangedSignal() { FocusGroupChangedSignal ret = new FocusGroupChangedSignal(NDalicManualPINVOKE.FocusManager_FocusGroupChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ViewSignal FocusedViewEnterKeySignal() { + internal ViewSignal FocusedViewEnterKeySignal() { ViewSignal ret = new ViewSignal(NDalicManualPINVOKE.FocusManager_FocusedActorEnterKeySignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -593,7 +593,7 @@ public class PreFocusChangeEventArgs : EventArgs public interface ICustomFocusAlgorithm { - View GetNextFocusableView(View current, View proposed, View.KeyboardFocus.Direction direction); + View GetNextFocusableView(View current, View proposed, View.Focus.Direction direction); } private class CustomAlgorithmInterfaceWrapper : CustomAlgorithmInterface @@ -609,7 +609,7 @@ public class PreFocusChangeEventArgs : EventArgs _customFocusAlgorithm = customFocusAlgorithm; } - public override View GetNextFocusableView(View current, View proposed, View.KeyboardFocus.Direction direction) + public override View GetNextFocusableView(View current, View proposed, View.Focus.Direction direction) { View currentView = View.DownCast(current); View proposedView = View.DownCast(proposed); diff --git a/plugins/dali-sharp/sharp/internal/Gesture.cs b/plugins/dali-sharp/sharp/public/Gesture.cs similarity index 93% rename from plugins/dali-sharp/sharp/internal/Gesture.cs rename to plugins/dali-sharp/sharp/public/Gesture.cs index 48ba55e..f3018cf 100644 --- a/plugins/dali-sharp/sharp/internal/Gesture.cs +++ b/plugins/dali-sharp/sharp/public/Gesture.cs @@ -74,12 +74,6 @@ public class Gesture : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Gesture Assign(Gesture rhs) { - Gesture ret = new Gesture(NDalicPINVOKE.Gesture_Assign(swigCPtr, Gesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private Gesture.GestureType type { set { NDalicPINVOKE.Gesture_type_set(swigCPtr, (int)value); diff --git a/plugins/dali-sharp/sharp/internal/HorizontalAlignmentType.cs b/plugins/dali-sharp/sharp/public/HorizontalAlignmentType.cs similarity index 94% rename from plugins/dali-sharp/sharp/internal/HorizontalAlignmentType.cs rename to plugins/dali-sharp/sharp/public/HorizontalAlignmentType.cs index 61ca361..b11bd35 100644 --- a/plugins/dali-sharp/sharp/internal/HorizontalAlignmentType.cs +++ b/plugins/dali-sharp/sharp/public/HorizontalAlignmentType.cs @@ -11,9 +11,9 @@ namespace Dali { public enum HorizontalAlignmentType { - LEFT, - CENTER, - RIGHT + Left, + Center, + Right } } diff --git a/plugins/dali-sharp/sharp/internal/Hover.cs b/plugins/dali-sharp/sharp/public/Hover.cs similarity index 91% rename from plugins/dali-sharp/sharp/internal/Hover.cs rename to plugins/dali-sharp/sharp/public/Hover.cs index 1e1d58c..556e0a1 100644 --- a/plugins/dali-sharp/sharp/internal/Hover.cs +++ b/plugins/dali-sharp/sharp/public/Hover.cs @@ -46,7 +46,7 @@ public class Hover : global::System.IDisposable { } - public static Hover GetHoverFromPtr(global::System.IntPtr cPtr) { + internal static Hover GetHoverFromPtr(global::System.IntPtr cPtr) { Hover ret = new Hover(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -63,7 +63,7 @@ public class Hover : global::System.IDisposable { public int GetDeviceId(uint point) { if( point < points.Count ) { - return points[(int)point].deviceId; + return points[(int)point].DeviceId; } return -1; } @@ -71,7 +71,7 @@ public class Hover : global::System.IDisposable { public PointStateType GetState(uint point) { if( point < points.Count ) { - return (Dali.PointStateType)(points[(int)point].state); + return (Dali.PointStateType)(points[(int)point].State); } return PointStateType.FINISHED; } @@ -79,7 +79,7 @@ public class Hover : global::System.IDisposable { public View GetHitView(uint point) { if( point < points.Count ) { - return points[(int)point].hitView; + return points[(int)point].HitView; } else { @@ -93,7 +93,7 @@ public class Hover : global::System.IDisposable { public Vector2 GetLocalPosition(uint point) { if( point < points.Count ) { - return points[(int)point].local; + return points[(int)point].Local; } return new Vector2(0.0f, 0.0f); } @@ -101,7 +101,7 @@ public class Hover : global::System.IDisposable { public Vector2 GetScreenPosition(uint point) { if( point < points.Count ) { - return points[(int)point].screen; + return points[(int)point].Screen; } return new Vector2(0.0f, 0.0f); } @@ -110,7 +110,7 @@ public class Hover : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Hover(uint time) : this(NDalicPINVOKE.new_Hover__SWIG_1(time), true) { + internal Hover(uint time) : this(NDalicPINVOKE.new_Hover__SWIG_1(time), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/Image.cs b/plugins/dali-sharp/sharp/public/Image.cs similarity index 99% rename from plugins/dali-sharp/sharp/internal/Image.cs rename to plugins/dali-sharp/sharp/public/Image.cs index 8dc5ca6..89a12a6 100644 --- a/plugins/dali-sharp/sharp/internal/Image.cs +++ b/plugins/dali-sharp/sharp/public/Image.cs @@ -171,7 +171,7 @@ public static Image GetImageFromPtr(global::System.IntPtr cPtr) { return ret; } - public ImageSignal UploadedSignal() { + internal ImageSignal UploadedSignal() { ImageSignal ret = new ImageSignal(NDalicPINVOKE.Image_UploadedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/ImageView.cs b/plugins/dali-sharp/sharp/public/ImageView.cs similarity index 63% rename from plugins/dali-sharp/sharp/internal/ImageView.cs rename to plugins/dali-sharp/sharp/public/ImageView.cs index a4e645e..f06f37c 100644 --- a/plugins/dali-sharp/sharp/internal/ImageView.cs +++ b/plugins/dali-sharp/sharp/public/ImageView.cs @@ -61,55 +61,18 @@ public class ImageView : View { } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ImageView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_ImageView_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int RESOURCE_URL = NDalicPINVOKE.ImageView_Property_RESOURCE_URL_get(); public static readonly int IMAGE = NDalicPINVOKE.ImageView_Property_IMAGE_get(); public static readonly int PRE_MULTIPLIED_ALPHA = NDalicPINVOKE.ImageView_Property_PRE_MULTIPLIED_ALPHA_get(); public static readonly int PIXEL_AREA = NDalicPINVOKE.ImageView_Property_PIXEL_AREA_get(); - } public ImageView () : this (NDalicPINVOKE.ImageView_New__SWIG_0(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ImageView (Image image) : this (NDalicPINVOKE.ImageView_New__SWIG_1(Image.getCPtr(image)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - - } public ImageView (string url) : this (NDalicPINVOKE.ImageView_New__SWIG_2(url), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -118,27 +81,13 @@ public class ImageView : View { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ImageView(ImageView imageView) : this(NDalicPINVOKE.new_ImageView__SWIG_1(ImageView.getCPtr(imageView)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public ImageView Assign(ImageView imageView) { - ImageView ret = new ImageView(NDalicPINVOKE.ImageView_Assign(swigCPtr, ImageView.getCPtr(imageView)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ImageView DownCast(BaseHandle handle) { + internal new static ImageView DownCast(BaseHandle handle) { ImageView ret = new ImageView(NDalicPINVOKE.ImageView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetImage(Image image) { - NDalicPINVOKE.ImageView_SetImage__SWIG_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void SetImage(string url) { NDalicPINVOKE.ImageView_SetImage__SWIG_1(swigCPtr, url); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -149,19 +98,6 @@ public class ImageView : View { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Image GetImage() { - Image ret = new Image(NDalicPINVOKE.ImageView_GetImage(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000 - } - public string ResourceUrl { get @@ -193,7 +129,7 @@ public class ImageView : View { get { bool temp = false; - GetProperty( ImageView.Property.PRE_MULTIPLIED_ALPHA).Get( ref temp ); + GetProperty( ImageView.Property.PRE_MULTIPLIED_ALPHA).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/Key.cs b/plugins/dali-sharp/sharp/public/Key.cs similarity index 96% rename from plugins/dali-sharp/sharp/internal/Key.cs rename to plugins/dali-sharp/sharp/public/Key.cs index 813c64c..2c3b6d6 100644 --- a/plugins/dali-sharp/sharp/internal/Key.cs +++ b/plugins/dali-sharp/sharp/public/Key.cs @@ -104,7 +104,7 @@ public class Key : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Key(string keyName, string keyString, int keyCode, int keyModifier, uint timeStamp, Key.StateType keyState) : this(NDalicPINVOKE.new_Key__SWIG_1(keyName, keyString, keyCode, keyModifier, timeStamp, (int)keyState), true) { + internal Key(string keyName, string keyString, int keyCode, int keyModifier, uint timeStamp, Key.StateType keyState) : this(NDalicPINVOKE.new_Key__SWIG_1(keyName, keyString, keyCode, keyModifier, timeStamp, (int)keyState), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/KeyFrames.cs b/plugins/dali-sharp/sharp/public/KeyFrames.cs similarity index 87% rename from plugins/dali-sharp/sharp/internal/KeyFrames.cs rename to plugins/dali-sharp/sharp/public/KeyFrames.cs index 9c45f3b..4f24686 100644 --- a/plugins/dali-sharp/sharp/internal/KeyFrames.cs +++ b/plugins/dali-sharp/sharp/public/KeyFrames.cs @@ -79,22 +79,12 @@ public class KeyFrames : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static KeyFrames DownCast(BaseHandle handle) { + internal static KeyFrames DownCast(BaseHandle handle) { KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public KeyFrames(KeyFrames handle) : this(NDalicPINVOKE.new_KeyFrames__SWIG_1(KeyFrames.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public KeyFrames Assign(KeyFrames rhs) { - KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_Assign(swigCPtr, KeyFrames.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public Property.Type GetType() { Property.Type ret = (Property.Type)NDalicPINVOKE.KeyFrames_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/KeyInputFocusManager.cs b/plugins/dali-sharp/sharp/public/KeyInputFocusManager.cs similarity index 93% rename from plugins/dali-sharp/sharp/internal/KeyInputFocusManager.cs rename to plugins/dali-sharp/sharp/public/KeyInputFocusManager.cs index 455f463..5959235 100644 --- a/plugins/dali-sharp/sharp/internal/KeyInputFocusManager.cs +++ b/plugins/dali-sharp/sharp/public/KeyInputFocusManager.cs @@ -39,7 +39,7 @@ public class KeyInputFocusManager : BaseHandle { } } - public KeyInputFocusManager() : this(NDalicPINVOKE.new_KeyInputFocusManager(), true) { + private KeyInputFocusManager() : this(NDalicPINVOKE.new_KeyInputFocusManager(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -65,7 +65,7 @@ public class KeyInputFocusManager : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() { + internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t KeyInputFocusChangedSignal() { SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__Control_Dali__Toolkit__ControlF_t(NDalicPINVOKE.KeyInputFocusManager_KeyInputFocusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/Layer.cs b/plugins/dali-sharp/sharp/public/Layer.cs similarity index 61% rename from plugins/dali-sharp/sharp/internal/Layer.cs rename to plugins/dali-sharp/sharp/public/Layer.cs index c32972c..74b271f 100644 --- a/plugins/dali-sharp/sharp/internal/Layer.cs +++ b/plugins/dali-sharp/sharp/public/Layer.cs @@ -59,55 +59,11 @@ namespace Dali } } - - public class Property : global::System.IDisposable + public class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() - { - Dispose(); - } - - public virtual void Dispose() - { - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Layer_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_Layer_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static readonly int CLIPPING_ENABLE = NDalicPINVOKE.Layer_Property_CLIPPING_ENABLE_get(); public static readonly int CLIPPING_BOX = NDalicPINVOKE.Layer_Property_CLIPPING_BOX_get(); public static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get(); - } public Layer() : this(NDalicPINVOKE.Layer_New(), true) @@ -117,7 +73,7 @@ namespace Dali } - public new static Layer DownCast(BaseHandle handle) + internal new static Layer DownCast(BaseHandle handle) { Layer ret = new Layer(NDalicPINVOKE.Layer_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -125,20 +81,6 @@ namespace Dali return ret; } - public Layer(Layer copy) : this(NDalicPINVOKE.new_Layer__SWIG_1(Layer.getCPtr(copy)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Layer Assign(Layer rhs) - { - Layer ret = new Layer(NDalicPINVOKE.Layer_Assign(swigCPtr, Layer.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public View FindChildById(uint id) { View ret = new View(NDalicPINVOKE.Actor_FindChildById(swigCPtr, id), true); @@ -225,14 +167,14 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetBehavior(Layer.LayerBehavior behavior) + private void SetBehavior(Layer.LayerBehavior behavior) { NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Layer.LayerBehavior GetBehavior() + private Layer.LayerBehavior GetBehavior() { Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -240,59 +182,7 @@ namespace Dali return ret; } - public void SetClipping(bool enabled) - { - NDalicPINVOKE.Layer_SetClipping(swigCPtr, enabled); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool IsClipping() - { - bool ret = NDalicPINVOKE.Layer_IsClipping(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetClippingBox(int x, int y, int width, int height) - { - NDalicPINVOKE.Layer_SetClippingBox__SWIG_0(swigCPtr, x, y, width, height); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetClippingBox(Rectangle box) - { - NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, Rectangle.getCPtr(box)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Rectangle GetClippingBox() - { - Rectangle ret = new Rectangle(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetDepthTestDisabled(bool disable) - { - NDalicPINVOKE.Layer_SetDepthTestDisabled(swigCPtr, disable); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool IsDepthTestDisabled() - { - bool ret = NDalicPINVOKE.Layer_IsDepthTestDisabled(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function) + internal void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function) { NDalicPINVOKE.Layer_SetSortFunction(swigCPtr, SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.getCPtr(function)); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -341,34 +231,6 @@ namespace Dali TREE_DEPTH_MULTIPLIER = 10000 } - public bool ClippingEnable - { - get - { - bool temp = false; - GetProperty(Layer.Property.CLIPPING_ENABLE).Get(ref temp); - return temp; - } - set - { - SetProperty(Layer.Property.CLIPPING_ENABLE, new Dali.Property.Value(value)); - } - } - - public Rectangle ClippingBox - { - get - { - Rectangle temp = new Rectangle(0, 0, 0, 0); - GetProperty(Layer.Property.CLIPPING_BOX).Get(temp); - return temp; - } - set - { - SetProperty(Layer.Property.CLIPPING_BOX, new Dali.Property.Value(value)); - } - } - public Layer.LayerBehavior Behavior { get diff --git a/plugins/dali-sharp/sharp/internal/LongPressGesture.cs b/plugins/dali-sharp/sharp/public/LongPressGesture.cs similarity index 87% rename from plugins/dali-sharp/sharp/internal/LongPressGesture.cs rename to plugins/dali-sharp/sharp/public/LongPressGesture.cs index 2cd44ee..71fbdc8 100644 --- a/plugins/dali-sharp/sharp/internal/LongPressGesture.cs +++ b/plugins/dali-sharp/sharp/public/LongPressGesture.cs @@ -79,16 +79,6 @@ public class LongPressGesture : Gesture { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public LongPressGesture(LongPressGesture rhs) : this(NDalicPINVOKE.new_LongPressGesture__SWIG_1(LongPressGesture.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public LongPressGesture Assign(LongPressGesture rhs) { - LongPressGesture ret = new LongPressGesture(NDalicPINVOKE.LongPressGesture_Assign(swigCPtr, LongPressGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private uint numberOfTouches { set { NDalicPINVOKE.LongPressGesture_numberOfTouches_set(swigCPtr, value); diff --git a/plugins/dali-sharp/sharp/internal/Matrix.cs b/plugins/dali-sharp/sharp/public/Matrix.cs similarity index 92% rename from plugins/dali-sharp/sharp/internal/Matrix.cs rename to plugins/dali-sharp/sharp/public/Matrix.cs index a7c5c62..d512365 100644 --- a/plugins/dali-sharp/sharp/internal/Matrix.cs +++ b/plugins/dali-sharp/sharp/public/Matrix.cs @@ -54,10 +54,6 @@ public class Matrix : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Matrix(bool initialize) : this(NDalicPINVOKE.new_Matrix__SWIG_1(initialize), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public Matrix(float[] array) : this(NDalicPINVOKE.new_Matrix__SWIG_2(array), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -66,16 +62,6 @@ public class Matrix : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Matrix(Matrix matrix) : this(NDalicPINVOKE.new_Matrix__SWIG_4(Matrix.getCPtr(matrix)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Matrix Assign(Matrix matrix) { - Matrix ret = new Matrix(NDalicPINVOKE.Matrix_Assign(swigCPtr, Matrix.getCPtr(matrix)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public static Matrix IDENTITY { get { global::System.IntPtr cPtr = NDalicPINVOKE.Matrix_IDENTITY_get(); @@ -171,7 +157,7 @@ public class Matrix : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_float AsFloat() { + internal SWIGTYPE_p_float AsFloat() { global::System.IntPtr cPtr = NDalicPINVOKE.Matrix_AsFloat__SWIG_0(swigCPtr); SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/Matrix3.cs b/plugins/dali-sharp/sharp/public/Matrix3.cs similarity index 88% rename from plugins/dali-sharp/sharp/internal/Matrix3.cs rename to plugins/dali-sharp/sharp/public/Matrix3.cs index 0b39649..d22233f 100644 --- a/plugins/dali-sharp/sharp/internal/Matrix3.cs +++ b/plugins/dali-sharp/sharp/public/Matrix3.cs @@ -10,7 +10,7 @@ namespace Dali { -public class Matrix3 : global::System.IDisposable { +internal class Matrix3 : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -71,18 +71,6 @@ public class Matrix3 : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Matrix3 Assign(Matrix3 matrix) { - Matrix3 ret = new Matrix3(NDalicPINVOKE.Matrix3_Assign__SWIG_0(swigCPtr, Matrix3.getCPtr(matrix)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Matrix3 Assign(Matrix matrix) { - Matrix3 ret = new Matrix3(NDalicPINVOKE.Matrix3_Assign__SWIG_1(swigCPtr, Matrix.getCPtr(matrix)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public bool EqualTo(Matrix3 rhs) { bool ret = NDalicPINVOKE.Matrix3_EqualTo(swigCPtr, Matrix3.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -100,7 +88,7 @@ public class Matrix3 : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_float AsFloat() { + internal SWIGTYPE_p_float AsFloat() { global::System.IntPtr cPtr = NDalicPINVOKE.Matrix3_AsFloat__SWIG_0(swigCPtr); SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/DaliEnumConstants.cs b/plugins/dali-sharp/sharp/public/NUIConstants.cs similarity index 89% rename from plugins/dali-sharp/sharp/internal/DaliEnumConstants.cs rename to plugins/dali-sharp/sharp/public/NUIConstants.cs index 305e7bf..3233a49 100755 --- a/plugins/dali-sharp/sharp/internal/DaliEnumConstants.cs +++ b/plugins/dali-sharp/sharp/public/NUIConstants.cs @@ -29,20 +29,6 @@ namespace Dali YAxisScrollBoundary } - public enum TextureType - { - Texture2D = Dali.TextureType.TEXTURE_2D, ///< One 2D image @SINCE_1_1.43 - TextureCube = Dali.TextureType.TEXTURE_CUBE ///< Six 2D images arranged in a cube-shape @SINCE_1_1.43 - } - - public enum ViewMode - { - Mono = Dali.ViewMode.MONO, ///< Monoscopic (single camera). This is the default @SINCE_1_0.0 - StereoHorizontal = Dali.ViewMode.STEREO_HORIZONTAL, ///< Stereoscopic. Frame buffer is split horizontally with the left and right camera views in their respective sides. @SINCE_1_0.0 - StereoVertical = Dali.ViewMode.STEREO_VERTICAL, ///< Stereoscopic. Frame buffer is split vertically with the left camera view at the top and the right camera view at the bottom. @SINCE_1_0.0 - StereoInterlaced = Dali.ViewMode.STEREO_INTERLACED ///< @DEPRECATED_1_1.19 @brief Stereoscopic. Left/Right camera views are rendered into the framebuffer on alternate frames. @SINCE_1_0.0 - } - public enum MeshVisualShadingModeValue { TexturelessWithDiffuseLighting = Dali.MeshVisualShadingModeValue.TEXTURELESS_WITH_DIFFUSE_LIGHTING, ///< *Simplest*. One color that is lit by ambient and diffuse lighting. @SINCE_1_1.45 @@ -60,8 +46,8 @@ namespace Dali { public enum Type { - LeftToRight = Dali.DirectionType.LEFT_TO_RIGHT, - RightToLeft = Dali.DirectionType.RIGHT_TO_LEFT + LeftToRight = Dali.DirectionType.LeftToRight, + RightToLeft = Dali.DirectionType.RightToLeft } } @@ -196,6 +182,17 @@ namespace Dali public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP; } + public enum PrimitiveVisualShapeType + { + SPHERE, + CONICAL_FRUSTRUM, + CONE, + CYLINDER, + CUBE, + OCTAHEDRON, + BEVELLED_CUBE + } + public struct Tooltip { public struct Property @@ -224,5 +221,12 @@ namespace Dali public static readonly int BelowVisual = NDalic.TOOLTIP_TAIL_BELOW_VISUAL; } } + + public enum TooltipPositionType + { + ABOVE, + BELOW, + HOVER_POINT + } } // namespace Constants } // namesapce Dali diff --git a/plugins/dali-sharp/sharp/internal/PaddingType.cs b/plugins/dali-sharp/sharp/public/PaddingType.cs similarity index 93% rename from plugins/dali-sharp/sharp/internal/PaddingType.cs rename to plugins/dali-sharp/sharp/public/PaddingType.cs index a2ec812..59858bc 100644 --- a/plugins/dali-sharp/sharp/internal/PaddingType.cs +++ b/plugins/dali-sharp/sharp/public/PaddingType.cs @@ -133,16 +133,6 @@ public class PaddingType : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PaddingType(PaddingType rhs) : this(NDalicPINVOKE.new_PaddingType__SWIG_2(PaddingType.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PaddingType Assign(PaddingType rhs) { - PaddingType ret = new PaddingType(NDalicPINVOKE.PaddingType_Assign(swigCPtr, PaddingType.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void Set(float newX, float newY, float newWidth, float newHeight) { NDalicPINVOKE.PaddingType_Set(swigCPtr, newX, newY, newWidth, newHeight); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/PanGesture.cs b/plugins/dali-sharp/sharp/public/PanGesture.cs similarity index 91% rename from plugins/dali-sharp/sharp/internal/PanGesture.cs rename to plugins/dali-sharp/sharp/public/PanGesture.cs index d822102..8345b45 100644 --- a/plugins/dali-sharp/sharp/internal/PanGesture.cs +++ b/plugins/dali-sharp/sharp/public/PanGesture.cs @@ -45,7 +45,7 @@ public class PanGesture : Gesture { } - public static PanGesture GetPanGestureFromPtr(global::System.IntPtr cPtr) { + internal static PanGesture GetPanGestureFromPtr(global::System.IntPtr cPtr) { PanGesture ret = new PanGesture(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -111,20 +111,10 @@ public class PanGesture : Gesture { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PanGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PanGesture__SWIG_1((int)state), true) { + internal PanGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PanGesture__SWIG_1((int)state), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PanGesture(PanGesture rhs) : this(NDalicPINVOKE.new_PanGesture__SWIG_2(PanGesture.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PanGesture Assign(PanGesture rhs) { - PanGesture ret = new PanGesture(NDalicPINVOKE.PanGesture_Assign(swigCPtr, PanGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private Vector2 velocity { set { NDalicPINVOKE.PanGesture_velocity_set(swigCPtr, Vector2.getCPtr(value)); diff --git a/plugins/dali-sharp/sharp/internal/Path.cs b/plugins/dali-sharp/sharp/public/Path.cs similarity index 71% rename from plugins/dali-sharp/sharp/internal/Path.cs rename to plugins/dali-sharp/sharp/public/Path.cs index 31897da..4bba3b4 100644 --- a/plugins/dali-sharp/sharp/internal/Path.cs +++ b/plugins/dali-sharp/sharp/public/Path.cs @@ -61,64 +61,16 @@ public class Path : BaseHandle { } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_Path_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_Path_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int POINTS = NDalicPINVOKE.Path_Property_POINTS_get(); public static readonly int CONTROL_POINTS = NDalicPINVOKE.Path_Property_CONTROL_POINTS_get(); - } public Path () : this (NDalicPINVOKE.Path_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static Path DownCast(BaseHandle handle) { - Path ret = new Path(NDalicPINVOKE.Path_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Path(Path handle) : this(NDalicPINVOKE.new_Path__SWIG_1(Path.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Path Assign(Path rhs) { - Path ret = new Path(NDalicPINVOKE.Path_Assign(swigCPtr, Path.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public void AddPoint(Vector3 point) { NDalicPINVOKE.Path_AddPoint(swigCPtr, Vector3.getCPtr(point)); diff --git a/plugins/dali-sharp/sharp/internal/PinchGesture.cs b/plugins/dali-sharp/sharp/public/PinchGesture.cs similarity index 85% rename from plugins/dali-sharp/sharp/internal/PinchGesture.cs rename to plugins/dali-sharp/sharp/public/PinchGesture.cs index e88b531..3a063e7 100644 --- a/plugins/dali-sharp/sharp/internal/PinchGesture.cs +++ b/plugins/dali-sharp/sharp/public/PinchGesture.cs @@ -45,7 +45,7 @@ public class PinchGesture : Gesture { } - public static PinchGesture GetPinchGestureFromPtr(global::System.IntPtr cPtr) { + internal static PinchGesture GetPinchGestureFromPtr(global::System.IntPtr cPtr) { PinchGesture ret = new PinchGesture(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -83,20 +83,10 @@ public class PinchGesture : Gesture { } } - public PinchGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PinchGesture__SWIG_0((int)state), true) { + internal PinchGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PinchGesture__SWIG_0((int)state), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PinchGesture(PinchGesture rhs) : this(NDalicPINVOKE.new_PinchGesture__SWIG_1(PinchGesture.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PinchGesture Assign(PinchGesture rhs) { - PinchGesture ret = new PinchGesture(NDalicPINVOKE.PinchGesture_Assign(swigCPtr, PinchGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private float scale { set { NDalicPINVOKE.PinchGesture_scale_set(swigCPtr, value); diff --git a/plugins/dali-sharp/sharp/internal/PointStateType.cs b/plugins/dali-sharp/sharp/public/PointStateType.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/PointStateType.cs rename to plugins/dali-sharp/sharp/public/PointStateType.cs diff --git a/plugins/dali-sharp/sharp/internal/Popup.cs b/plugins/dali-sharp/sharp/public/Popup.cs similarity index 89% rename from plugins/dali-sharp/sharp/internal/Popup.cs rename to plugins/dali-sharp/sharp/public/Popup.cs index 79d92f5..6ce31e6 100644 --- a/plugins/dali-sharp/sharp/internal/Popup.cs +++ b/plugins/dali-sharp/sharp/public/Popup.cs @@ -327,40 +327,8 @@ public class Popup : View { } } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_Popup_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_Popup_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int TITLE = NDalicPINVOKE.Popup_Property_TITLE_get(); public static readonly int CONTENT = NDalicPINVOKE.Popup_Property_CONTENT_get(); public static readonly int FOOTER = NDalicPINVOKE.Popup_Property_FOOTER_get(); @@ -382,22 +350,12 @@ public class Popup : View { public static readonly int TAIL_DOWN_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_DOWN_IMAGE_get(); public static readonly int TAIL_LEFT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_LEFT_IMAGE_get(); public static readonly int TAIL_RIGHT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_RIGHT_IMAGE_get(); - } public Popup () : this (NDalicPINVOKE.Popup_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Popup(Popup handle) : this(NDalicPINVOKE.new_Popup__SWIG_1(Popup.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Popup Assign(Popup handle) { - Popup ret = new Popup(NDalicPINVOKE.Popup_Assign(swigCPtr, Popup.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public new static Popup DownCast(BaseHandle handle) { Popup ret = new Popup(NDalicPINVOKE.Popup_DownCast(BaseHandle.getCPtr(handle)), true); @@ -449,41 +407,36 @@ public class Popup : View { return ret; } - public VoidSignal OutsideTouchedSignal() { + internal VoidSignal OutsideTouchedSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_OutsideTouchedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal ShowingSignal() { + internal VoidSignal ShowingSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_ShowingSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal ShownSignal() { + internal VoidSignal ShownSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_ShownSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal HidingSignal() { + internal VoidSignal HidingSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_HidingSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal HiddenSignal() { + internal VoidSignal HiddenSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Popup_HiddenSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public enum DisplayStateType { SHOWING, SHOWN, @@ -563,7 +516,7 @@ public class Popup : View { get { bool temp = false; - GetProperty( Popup.Property.TOUCH_TRANSPARENT).Get( ref temp ); + GetProperty( Popup.Property.TOUCH_TRANSPARENT).Get( out temp ); return temp; } set @@ -576,7 +529,7 @@ public class Popup : View { get { bool temp = false; - GetProperty( Popup.Property.TAIL_VISIBILITY).Get( ref temp ); + GetProperty( Popup.Property.TAIL_VISIBILITY).Get( out temp ); return temp; } set @@ -615,7 +568,7 @@ public class Popup : View { get { float temp = 0.0f; - GetProperty( Popup.Property.ANIMATION_DURATION).Get( ref temp ); + GetProperty( Popup.Property.ANIMATION_DURATION).Get( out temp ); return temp; } set @@ -667,7 +620,7 @@ public class Popup : View { get { int temp = 0; - GetProperty( Popup.Property.AUTO_HIDE_DELAY).Get( ref temp ); + GetProperty( Popup.Property.AUTO_HIDE_DELAY).Get( out temp ); return temp; } set @@ -680,7 +633,7 @@ public class Popup : View { get { bool temp = false; - GetProperty( Popup.Property.BACKING_ENABLED).Get( ref temp ); + GetProperty( Popup.Property.BACKING_ENABLED).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/Position.cs b/plugins/dali-sharp/sharp/public/Position.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/Position.cs rename to plugins/dali-sharp/sharp/public/Position.cs diff --git a/plugins/dali-sharp/sharp/internal/Position2D.cs b/plugins/dali-sharp/sharp/public/Position2D.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/Position2D.cs rename to plugins/dali-sharp/sharp/public/Position2D.cs diff --git a/plugins/dali-sharp/sharp/internal/ProgressBar.cs b/plugins/dali-sharp/sharp/public/ProgressBar.cs similarity index 85% rename from plugins/dali-sharp/sharp/internal/ProgressBar.cs rename to plugins/dali-sharp/sharp/public/ProgressBar.cs index 5bb8281..7cc7afc 100644 --- a/plugins/dali-sharp/sharp/internal/ProgressBar.cs +++ b/plugins/dali-sharp/sharp/public/ProgressBar.cs @@ -169,40 +169,8 @@ public class ValueChangedEventArgs : EventArgs } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ProgressBar_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_ProgressBar_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VALUE_get(); public static readonly int SECONDARY_PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get(); public static readonly int INDETERMINATE = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_get(); @@ -212,7 +180,6 @@ public class ValueChangedEventArgs : EventArgs public static readonly int INDETERMINATE_VISUAL = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_get(); public static readonly int INDETERMINATE_VISUAL_ANIMATION = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get(); public static readonly int LABEL_VISUAL = NDalicPINVOKE.ProgressBar_Property_LABEL_VISUAL_get(); - } public ProgressBar () : this (NDalicPINVOKE.ProgressBar_New(), true) { @@ -235,23 +202,18 @@ public class ValueChangedEventArgs : EventArgs return ret; } - public ProgressBarValueChangedSignal ValueChangedSignal() { + internal ProgressBarValueChangedSignal ValueChangedSignal() { ProgressBarValueChangedSignal ret = new ProgressBarValueChangedSignal(NDalicPINVOKE.ProgressBar_ValueChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public float ProgressValue { get { float temp = 0.0f; - GetProperty( ProgressBar.Property.PROGRESS_VALUE).Get( ref temp ); + GetProperty( ProgressBar.Property.PROGRESS_VALUE).Get( out temp ); return temp; } set @@ -264,7 +226,7 @@ public class ValueChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get( ref temp ); + GetProperty( ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get( out temp ); return temp; } set @@ -277,7 +239,7 @@ public class ValueChangedEventArgs : EventArgs get { bool temp = false; - GetProperty( ProgressBar.Property.INDETERMINATE).Get( ref temp ); + GetProperty( ProgressBar.Property.INDETERMINATE).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/Property.cs b/plugins/dali-sharp/sharp/public/Property.cs similarity index 87% rename from plugins/dali-sharp/sharp/internal/Property.cs rename to plugins/dali-sharp/sharp/public/Property.cs index f1dc0f9..599d688 100644 --- a/plugins/dali-sharp/sharp/internal/Property.cs +++ b/plugins/dali-sharp/sharp/public/Property.cs @@ -86,7 +86,7 @@ public class Property : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Animatable _object { + internal Animatable _object { set { NDalicPINVOKE.Property__object_set(swigCPtr, Animatable.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -224,18 +224,11 @@ public class Property : global::System.IDisposable { return ret; } - public Property.Value ValueOfIndex(uint index) { + private Property.Value ValueOfIndex(uint index) { Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Array_ValueOfIndex__SWIG_0(swigCPtr, index), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public Property.Array Assign(Property.Array other) { - Property.Array ret = new Property.Array(NDalicPINVOKE.Property_Array_Assign(swigCPtr, Property.Array.getCPtr(other)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } public class Key : global::System.IDisposable { @@ -268,19 +261,19 @@ public class Property : global::System.IDisposable { } } - public Property.Key.Type type { + public Property.Key.KeyType Type { set { NDalicPINVOKE.Property_Key_type_set(swigCPtr, (int)value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get { - Property.Key.Type ret = (Property.Key.Type)NDalicPINVOKE.Property_Key_type_get(swigCPtr); + Property.Key.KeyType ret = (Property.Key.KeyType)NDalicPINVOKE.Property_Key_type_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } } - public int indexKey { + public int IndexKey { set { NDalicPINVOKE.Property_Key_indexKey_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -292,7 +285,7 @@ public class Property : global::System.IDisposable { } } - public string stringKey { + public string StringKey { set { NDalicPINVOKE.Property_Key_stringKey_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -348,7 +341,7 @@ public class Property : global::System.IDisposable { return ret; } - public enum Type { + public enum KeyType { INDEX, STRING } @@ -448,33 +441,14 @@ public class Property : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public string GetKey(uint position) { - string ret = NDalicPINVOKE.Property_Map_GetKey(swigCPtr, position); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Property.Key GetKeyAt(uint position) { + + public Property.Key GetKey(uint position) { Property.Key ret = new Property.Key(NDalicPINVOKE.Property_Map_GetKeyAt(swigCPtr, position), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public StringValuePair GetPair(uint position) { - StringValuePair ret = new StringValuePair(NDalicPINVOKE.Property_Map_GetPair(swigCPtr, position), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Property.Value Find(string key) { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_0(swigCPtr, key); - Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Property.Value Find(int key) { + + internal Property.Value Find(int key) { global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_2(swigCPtr, key); Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -487,21 +461,7 @@ public class Property : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public Property.Value Find(string key, Property.Type type) { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_4(swigCPtr, key, (int)type); - Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Property.Value Find(int key, Property.Type type) { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_5(swigCPtr, key, (int)type); - Property.Value ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Value(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - + public void Clear() { NDalicPINVOKE.Property_Map_Clear(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -512,24 +472,17 @@ public class Property : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Property.Value ValueOfIndex(string key) { + internal Property.Value ValueOfIndex(string key) { Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_0(swigCPtr, key), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Property.Value ValueOfIndex(int key) { + internal Property.Value ValueOfIndex(int key) { Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_2(swigCPtr, key), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public Property.Map Assign(Property.Map other) { - Property.Map ret = new Property.Map(NDalicPINVOKE.Property_Map_Assign(swigCPtr, Property.Map.getCPtr(other)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } public class Value : global::System.IDisposable { @@ -715,11 +668,7 @@ public class Property : global::System.IDisposable { public Value(Vector4 vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_6(Vector4.getCPtr(vectorValue)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - - public Value(Matrix3 matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_7(Matrix3.getCPtr(matrixValue)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public Value(Matrix matrixValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_8(Matrix.getCPtr(matrixValue)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -755,33 +704,27 @@ public class Property : global::System.IDisposable { public Value(Property.Value value) : this(NDalicPINVOKE.new_Property_Value__SWIG_17(Property.Value.getCPtr(value)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - - public Property.Value Assign(Property.Value value) { - Property.Value ret = new Property.Value(NDalicPINVOKE.Property_Value_Assign(swigCPtr, Property.Value.getCPtr(value)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - + public Property.Type GetType() { Property.Type ret = (Property.Type)NDalicPINVOKE.Property_Value_GetType(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool Get(ref bool boolValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_1(swigCPtr, ref boolValue); + public bool Get(out bool boolValue) { + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_1(swigCPtr, out boolValue); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool Get(ref float floatValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_2(swigCPtr, ref floatValue); + public bool Get(out float floatValue) { + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_2(swigCPtr, out floatValue); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool Get(ref int integerValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_3(swigCPtr, ref integerValue); + public bool Get(out int integerValue) { + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_3(swigCPtr, out integerValue); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -809,13 +752,7 @@ public class Property : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public bool Get(Matrix3 matrixValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_8(swigCPtr, Matrix3.getCPtr(matrixValue)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - + public bool Get(Matrix matrixValue) { bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_9(swigCPtr, Matrix.getCPtr(matrixValue)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -851,21 +788,7 @@ public class Property : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - public Property.Array GetArray() { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetArray(swigCPtr); - Property.Array ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Array(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Property.Map GetMap() { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetMap(swigCPtr); - Property.Map ret = (cPtr == global::System.IntPtr.Zero) ? null : new Property.Map(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - + } public enum Type { diff --git a/plugins/dali-sharp/sharp/public/PushButton.cs b/plugins/dali-sharp/sharp/public/PushButton.cs new file mode 100644 index 0000000..876b9f2 --- /dev/null +++ b/plugins/dali-sharp/sharp/public/PushButton.cs @@ -0,0 +1,114 @@ +/** Copyright (c) 2017 Samsung Electronics Co., Ltd. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ +// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts +//------------------------------------------------------------------------------ +// +// +// This file was automatically generated by SWIG (http://www.swig.org). +// Version 3.0.10 +// +// Do not make changes to this file unless you know what you are doing--modify +// the SWIG interface file instead. +//------------------------------------------------------------------------------ + +namespace Dali { + +public class PushButton : Button { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + + internal PushButton(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PushButton_SWIGUpcast(cPtr), cMemoryOwn) { + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + } + + internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PushButton obj) { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + ~PushButton() { + DisposeQueue.Instance.Add(this); + } + + public override void Dispose() { + if (!Window.IsInstalled()) { + DisposeQueue.Instance.Add(this); + return; + } + + lock(this) { + if (swigCPtr.Handle != global::System.IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + NDalicPINVOKE.delete_PushButton(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + global::System.GC.SuppressFinalize(this); + base.Dispose(); + } + } + + + public class Property + { + public static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get(); + public static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get(); + public static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get(); + public static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get(); + public static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get(); + } + + public PushButton () : this (NDalicPINVOKE.PushButton_New(), true) { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + + } + + internal new static PushButton DownCast(BaseHandle handle) { + PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + + public string LabelPadding + { + get + { + string temp; + GetProperty( PushButton.Property.LABEL_PADDING).Get( out temp ); + return temp; + } + set + { + SetProperty( PushButton.Property.LABEL_PADDING, new Dali.Property.Value( value ) ); + } + } + public string IconPadding + { + get + { + string temp; + GetProperty( PushButton.Property.ICON_PADDING).Get( out temp ); + return temp; + } + set + { + SetProperty( PushButton.Property.ICON_PADDING, new Dali.Property.Value( value ) ); + } + } + +} + +} diff --git a/plugins/dali-sharp/sharp/internal/Radian.cs b/plugins/dali-sharp/sharp/public/Radian.cs similarity index 83% rename from plugins/dali-sharp/sharp/internal/Radian.cs rename to plugins/dali-sharp/sharp/public/Radian.cs index dd791ef..0c5e9a2 100644 --- a/plugins/dali-sharp/sharp/internal/Radian.cs +++ b/plugins/dali-sharp/sharp/public/Radian.cs @@ -58,25 +58,13 @@ public class Radian : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Radian Assign(float value) { - Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_0(swigCPtr, value), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Radian Assign(Degree degree) { - Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_1(swigCPtr, Degree.getCPtr(degree)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public float ConvertToFloat() { float ret = NDalicPINVOKE.Radian_ConvertToFloat(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public float radian { + public float Value { set { NDalicPINVOKE.Radian_radian_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/RadioButton.cs b/plugins/dali-sharp/sharp/public/RadioButton.cs similarity index 82% rename from plugins/dali-sharp/sharp/internal/RadioButton.cs rename to plugins/dali-sharp/sharp/public/RadioButton.cs index 8b70cb5..19fc865 100644 --- a/plugins/dali-sharp/sharp/internal/RadioButton.cs +++ b/plugins/dali-sharp/sharp/public/RadioButton.cs @@ -69,17 +69,8 @@ public class RadioButton : Button { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public RadioButton(RadioButton radioButton) : this(NDalicPINVOKE.new_RadioButton__SWIG_1(RadioButton.getCPtr(radioButton)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public RadioButton Assign(RadioButton radioButton) { - RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_Assign(swigCPtr, RadioButton.getCPtr(radioButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public new static RadioButton DownCast(BaseHandle handle) { + internal new static RadioButton DownCast(BaseHandle handle) { RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/Rectangle.cs b/plugins/dali-sharp/sharp/public/Rectangle.cs similarity index 94% rename from plugins/dali-sharp/sharp/internal/Rectangle.cs rename to plugins/dali-sharp/sharp/public/Rectangle.cs index ae1a2e1..c2df5e8 100644 --- a/plugins/dali-sharp/sharp/internal/Rectangle.cs +++ b/plugins/dali-sharp/sharp/public/Rectangle.cs @@ -133,16 +133,6 @@ public class Rectangle : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Rectangle(Rectangle rhs) : this(NDalicPINVOKE.new_Rectangle__SWIG_2(Rectangle.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Rectangle Assign(Rectangle rhs) { - Rectangle ret = new Rectangle(NDalicPINVOKE.Rectangle_Assign(swigCPtr, Rectangle.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void Set(int newX, int newY, int newWidth, int newHeight) { NDalicPINVOKE.Rectangle_Set(swigCPtr, newX, newY, newWidth, newHeight); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/RelayoutContainer.cs b/plugins/dali-sharp/sharp/public/RelayoutContainer.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/RelayoutContainer.cs rename to plugins/dali-sharp/sharp/public/RelayoutContainer.cs diff --git a/plugins/dali-sharp/sharp/internal/Rotation.cs b/plugins/dali-sharp/sharp/public/Rotation.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/Rotation.cs rename to plugins/dali-sharp/sharp/public/Rotation.cs diff --git a/plugins/dali-sharp/sharp/internal/ScrollBar.cs b/plugins/dali-sharp/sharp/public/ScrollBar.cs similarity index 83% rename from plugins/dali-sharp/sharp/internal/ScrollBar.cs rename to plugins/dali-sharp/sharp/public/ScrollBar.cs index 3266752..26c1b86 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollBar.cs +++ b/plugins/dali-sharp/sharp/public/ScrollBar.cs @@ -186,40 +186,8 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ScrollBar_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_ScrollBar_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int SCROLL_DIRECTION = NDalicPINVOKE.ScrollBar_Property_SCROLL_DIRECTION_get(); public static readonly int INDICATOR_HEIGHT_POLICY = NDalicPINVOKE.ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get(); public static readonly int INDICATOR_FIXED_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get(); @@ -229,7 +197,6 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs public static readonly int INDICATOR_MINIMUM_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get(); public static readonly int INDICATOR_START_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_START_PADDING_get(); public static readonly int INDICATOR_END_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_END_PADDING_get(); - } public ScrollBar (ScrollBar.Direction direction) : this (NDalicPINVOKE.ScrollBar_New__SWIG_0((int)direction), true) { @@ -244,13 +211,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ScrollBar Assign(ScrollBar scrollBar) { - ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_Assign(swigCPtr, ScrollBar.getCPtr(scrollBar)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ScrollBar DownCast(BaseHandle handle) { + internal new static ScrollBar DownCast(BaseHandle handle) { ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -272,17 +233,6 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs return ret; } - public void SetScrollPositionIntervals(VectorFloat positions) { - NDalicPINVOKE.ScrollBar_SetScrollPositionIntervals(swigCPtr, VectorFloat.getCPtr(positions)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public VectorFloat GetScrollPositionIntervals() { - VectorFloat ret = new VectorFloat(NDalicPINVOKE.ScrollBar_GetScrollPositionIntervals(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void SetScrollDirection(ScrollBar.Direction direction) { NDalicPINVOKE.ScrollBar_SetScrollDirection(swigCPtr, (int)direction); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -294,45 +244,45 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs return ret; } - public void SetIndicatorHeightPolicy(ScrollBar.IndicatorHeightPolicyType policy) { + private void SetIndicatorHeightPolicy(ScrollBar.IndicatorHeightPolicyType policy) { NDalicPINVOKE.ScrollBar_SetIndicatorHeightPolicy(swigCPtr, (int)policy); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ScrollBar.IndicatorHeightPolicyType GetIndicatorHeightPolicy() { + private ScrollBar.IndicatorHeightPolicyType GetIndicatorHeightPolicy() { ScrollBar.IndicatorHeightPolicyType ret = (ScrollBar.IndicatorHeightPolicyType)NDalicPINVOKE.ScrollBar_GetIndicatorHeightPolicy(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetIndicatorFixedHeight(float height) { + private void SetIndicatorFixedHeight(float height) { NDalicPINVOKE.ScrollBar_SetIndicatorFixedHeight(swigCPtr, height); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float GetIndicatorFixedHeight() { + private float GetIndicatorFixedHeight() { float ret = NDalicPINVOKE.ScrollBar_GetIndicatorFixedHeight(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetIndicatorShowDuration(float durationSeconds) { + private void SetIndicatorShowDuration(float durationSeconds) { NDalicPINVOKE.ScrollBar_SetIndicatorShowDuration(swigCPtr, durationSeconds); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float GetIndicatorShowDuration() { + private float GetIndicatorShowDuration() { float ret = NDalicPINVOKE.ScrollBar_GetIndicatorShowDuration(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetIndicatorHideDuration(float durationSeconds) { + private void SetIndicatorHideDuration(float durationSeconds) { NDalicPINVOKE.ScrollBar_SetIndicatorHideDuration(swigCPtr, durationSeconds); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float GetIndicatorHideDuration() { + private float GetIndicatorHideDuration() { float ret = NDalicPINVOKE.ScrollBar_GetIndicatorHideDuration(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -348,23 +298,18 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public VoidSignal PanFinishedSignal() { + internal VoidSignal PanFinishedSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.ScrollBar_PanFinishedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public FloatSignal ScrollPositionIntervalReachedSignal() { + internal FloatSignal ScrollPositionIntervalReachedSignal() { FloatSignal ret = new FloatSignal(NDalicPINVOKE.ScrollBar_ScrollPositionIntervalReachedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public enum Direction { Vertical = 0, Horizontal @@ -406,7 +351,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get( ref temp ); + GetProperty( ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get( out temp ); return temp; } set @@ -419,7 +364,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollBar.Property.INDICATOR_SHOW_DURATION).Get( ref temp ); + GetProperty( ScrollBar.Property.INDICATOR_SHOW_DURATION).Get( out temp ); return temp; } set @@ -432,7 +377,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollBar.Property.INDICATOR_HIDE_DURATION).Get( ref temp ); + GetProperty( ScrollBar.Property.INDICATOR_HIDE_DURATION).Get( out temp ); return temp; } set @@ -458,7 +403,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get( ref temp ); + GetProperty( ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get( out temp ); return temp; } set @@ -471,7 +416,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollBar.Property.INDICATOR_START_PADDING).Get( ref temp ); + GetProperty( ScrollBar.Property.INDICATOR_START_PADDING).Get( out temp ); return temp; } set @@ -484,7 +429,7 @@ public class ScrollPositionIntervalReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollBar.Property.INDICATOR_END_PADDING).Get( ref temp ); + GetProperty( ScrollBar.Property.INDICATOR_END_PADDING).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/ScrollView.cs b/plugins/dali-sharp/sharp/public/ScrollView.cs similarity index 82% rename from plugins/dali-sharp/sharp/internal/ScrollView.cs rename to plugins/dali-sharp/sharp/public/ScrollView.cs index b67bbb2..3a7cd0b 100644 --- a/plugins/dali-sharp/sharp/internal/ScrollView.cs +++ b/plugins/dali-sharp/sharp/public/ScrollView.cs @@ -149,81 +149,15 @@ public class SnapStartedEventArgs : EventArgs } } - - public class ClampEvent : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ClampEvent(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ClampEvent obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~ClampEvent() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ScrollView_ClampEvent(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public ClampState2D scale { - set { - NDalicPINVOKE.ScrollView_ClampEvent_scale_set(swigCPtr, ClampState2D.getCPtr(value)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_ClampEvent_scale_get(swigCPtr); - ClampState2D ret = (cPtr == global::System.IntPtr.Zero) ? null : new ClampState2D(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public ClampState2D position { - set { - NDalicPINVOKE.ScrollView_ClampEvent_position_set(swigCPtr, ClampState2D.getCPtr(value)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - global::System.IntPtr cPtr = NDalicPINVOKE.ScrollView_ClampEvent_position_get(swigCPtr); - ClampState2D ret = (cPtr == global::System.IntPtr.Zero) ? null : new ClampState2D(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public ClampState rotation { - set { - NDalicPINVOKE.ScrollView_ClampEvent_rotation_set(swigCPtr, (int)value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - ClampState ret = (ClampState)NDalicPINVOKE.ScrollView_ClampEvent_rotation_get(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public ClampEvent() : this(NDalicPINVOKE.new_ScrollView_ClampEvent(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - } - + + + + + + + + + public class SnapEvent : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; protected bool swigCMemOwn; @@ -303,40 +237,14 @@ public class SnapStartedEventArgs : EventArgs } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ScrollView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_ScrollView_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + + + + + public class Property + { + + public static readonly int WRAP_ENABLED = NDalicPINVOKE.ScrollView_Property_WRAP_ENABLED_get(); public static readonly int PANNING_ENABLED = NDalicPINVOKE.ScrollView_Property_PANNING_ENABLED_get(); public static readonly int AXIS_AUTO_LOCK_ENABLED = NDalicPINVOKE.ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get(); @@ -364,24 +272,15 @@ public class SnapStartedEventArgs : EventArgs public static readonly int SCROLL_DOMAIN_OFFSET = NDalicPINVOKE.ScrollView_Property_SCROLL_DOMAIN_OFFSET_get(); public static readonly int SCROLL_POSITION_DELTA = NDalicPINVOKE.ScrollView_Property_SCROLL_POSITION_DELTA_get(); public static readonly int START_PAGE_POSITION = NDalicPINVOKE.ScrollView_Property_START_PAGE_POSITION_get(); - + } public ScrollView () : this (NDalicPINVOKE.ScrollView_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ScrollView(ScrollView handle) : this(NDalicPINVOKE.new_ScrollView__SWIG_1(ScrollView.getCPtr(handle)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ScrollView Assign(ScrollView handle) { - ScrollView ret = new ScrollView(NDalicPINVOKE.ScrollView_Assign(swigCPtr, ScrollView.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public new static ScrollView DownCast(BaseHandle handle) { + internal new static ScrollView DownCast(BaseHandle handle) { ScrollView ret = new ScrollView(NDalicPINVOKE.ScrollView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -431,16 +330,6 @@ public class SnapStartedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetRulerX(RulerPtr ruler) { - NDalicPINVOKE.ScrollView_SetRulerX(swigCPtr, RulerPtr.getCPtr(ruler)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetRulerY(RulerPtr ruler) { - NDalicPINVOKE.ScrollView_SetRulerY(swigCPtr, RulerPtr.getCPtr(ruler)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void SetScrollSensitive(bool sensitive) { NDalicPINVOKE.ScrollView_SetScrollSensitive(swigCPtr, sensitive); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -638,16 +527,11 @@ public class SnapStartedEventArgs : EventArgs return ret; } - public void ApplyConstraintToChildren(SWIGTYPE_p_Dali__Constraint constraint) { + internal void ApplyConstraintToChildren(SWIGTYPE_p_Dali__Constraint constraint) { NDalicPINVOKE.ScrollView_ApplyConstraintToChildren(swigCPtr, SWIGTYPE_p_Dali__Constraint.getCPtr(constraint)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveConstraintsFromChildren() { - NDalicPINVOKE.ScrollView_RemoveConstraintsFromChildren(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void ApplyEffect(ScrollViewEffect effect) { NDalicPINVOKE.ScrollView_ApplyEffect(swigCPtr, ScrollViewEffect.getCPtr(effect)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -688,25 +572,18 @@ public class SnapStartedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ScrollViewSnapStartedSignal SnapStartedSignal() { + internal ScrollViewSnapStartedSignal SnapStartedSignal() { ScrollViewSnapStartedSignal ret = new ScrollViewSnapStartedSignal(NDalicPINVOKE.ScrollView_SnapStartedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000 - } - public bool WrapEnabled { get { bool temp = false; - GetProperty( ScrollView.Property.WRAP_ENABLED).Get( ref temp ); + GetProperty( ScrollView.Property.WRAP_ENABLED).Get( out temp ); return temp; } set @@ -719,7 +596,7 @@ public class SnapStartedEventArgs : EventArgs get { bool temp = false; - GetProperty( ScrollView.Property.PANNING_ENABLED).Get( ref temp ); + GetProperty( ScrollView.Property.PANNING_ENABLED).Get( out temp ); return temp; } set @@ -732,7 +609,7 @@ public class SnapStartedEventArgs : EventArgs get { bool temp = false; - GetProperty( ScrollView.Property.AXIS_AUTO_LOCK_ENABLED).Get( ref temp ); + GetProperty( ScrollView.Property.AXIS_AUTO_LOCK_ENABLED).Get( out temp ); return temp; } set @@ -797,7 +674,7 @@ public class SnapStartedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollView.Property.OVERSHOOT_X).Get( ref temp ); + GetProperty( ScrollView.Property.OVERSHOOT_X).Get( out temp ); return temp; } set @@ -810,7 +687,7 @@ public class SnapStartedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( ScrollView.Property.OVERSHOOT_Y).Get( ref temp ); + GetProperty( ScrollView.Property.OVERSHOOT_Y).Get( out temp ); return temp; } set @@ -836,7 +713,7 @@ public class SnapStartedEventArgs : EventArgs get { bool temp = false; - GetProperty( ScrollView.Property.WRAP).Get( ref temp ); + GetProperty( ScrollView.Property.WRAP).Get( out temp ); return temp; } set @@ -849,7 +726,7 @@ public class SnapStartedEventArgs : EventArgs get { bool temp = false; - GetProperty( ScrollView.Property.PANNING).Get( ref temp ); + GetProperty( ScrollView.Property.PANNING).Get( out temp ); return temp; } set @@ -862,7 +739,7 @@ public class SnapStartedEventArgs : EventArgs get { bool temp = false; - GetProperty( ScrollView.Property.SCROLLING).Get( ref temp ); + GetProperty( ScrollView.Property.SCROLLING).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/ScrollViewEffect.cs b/plugins/dali-sharp/sharp/public/ScrollViewEffect.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/ScrollViewEffect.cs rename to plugins/dali-sharp/sharp/public/ScrollViewEffect.cs diff --git a/plugins/dali-sharp/sharp/internal/Scrollable.cs b/plugins/dali-sharp/sharp/public/Scrollable.cs similarity index 84% rename from plugins/dali-sharp/sharp/internal/Scrollable.cs rename to plugins/dali-sharp/sharp/public/Scrollable.cs index 42569a7..92acccf 100644 --- a/plugins/dali-sharp/sharp/internal/Scrollable.cs +++ b/plugins/dali-sharp/sharp/public/Scrollable.cs @@ -255,40 +255,8 @@ public class CompletedEventArgs : EventArgs } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_Scrollable_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_Scrollable_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int OVERSHOOT_EFFECT_COLOR = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get(); public static readonly int OVERSHOOT_ANIMATION_SPEED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get(); public static readonly int OVERSHOOT_ENABLED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ENABLED_get(); @@ -303,7 +271,6 @@ public class CompletedEventArgs : EventArgs public static readonly int SCROLL_POSITION_MAX_Y = NDalicPINVOKE.Scrollable_Property_SCROLL_POSITION_MAX_Y_get(); public static readonly int CAN_SCROLL_VERTICAL = NDalicPINVOKE.Scrollable_Property_CAN_SCROLL_VERTICAL_get(); public static readonly int CAN_SCROLL_HORIZONTAL = NDalicPINVOKE.Scrollable_Property_CAN_SCROLL_HORIZONTAL_get(); - } public Scrollable() : this(NDalicPINVOKE.new_Scrollable__SWIG_0(), true) { @@ -314,76 +281,63 @@ public class CompletedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Scrollable Assign(Scrollable handle) { - Scrollable ret = new Scrollable(NDalicPINVOKE.Scrollable_Assign(swigCPtr, Scrollable.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static Scrollable DownCast(BaseHandle handle) { + internal new static Scrollable DownCast(BaseHandle handle) { Scrollable ret = new Scrollable(NDalicPINVOKE.Scrollable_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool IsOvershootEnabled() { + private bool IsOvershootEnabled() { bool ret = NDalicPINVOKE.Scrollable_IsOvershootEnabled(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetOvershootEnabled(bool enable) { + private void SetOvershootEnabled(bool enable) { NDalicPINVOKE.Scrollable_SetOvershootEnabled(swigCPtr, enable); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetOvershootEffectColor(Vector4 color) { + private void SetOvershootEffectColor(Vector4 color) { NDalicPINVOKE.Scrollable_SetOvershootEffectColor(swigCPtr, Vector4.getCPtr(color)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Vector4 GetOvershootEffectColor() { + private Vector4 GetOvershootEffectColor() { Vector4 ret = new Vector4(NDalicPINVOKE.Scrollable_GetOvershootEffectColor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetOvershootAnimationSpeed(float pixelsPerSecond) { + private void SetOvershootAnimationSpeed(float pixelsPerSecond) { NDalicPINVOKE.Scrollable_SetOvershootAnimationSpeed(swigCPtr, pixelsPerSecond); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float GetOvershootAnimationSpeed() { + private float GetOvershootAnimationSpeed() { float ret = NDalicPINVOKE.Scrollable_GetOvershootAnimationSpeed(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ScrollableSignal ScrollStartedSignal() { + internal ScrollableSignal ScrollStartedSignal() { ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollStartedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ScrollableSignal ScrollUpdatedSignal() { + internal ScrollableSignal ScrollUpdatedSignal() { ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollUpdatedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public ScrollableSignal ScrollCompletedSignal() { + internal ScrollableSignal ScrollCompletedSignal() { ScrollableSignal ret = new ScrollableSignal(NDalicPINVOKE.Scrollable_ScrollCompletedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX+1000 - } - public Vector4 OvershootEffectColor { get @@ -402,7 +356,7 @@ public class CompletedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get( ref temp ); + GetProperty( Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get( out temp ); return temp; } set @@ -415,7 +369,7 @@ public class CompletedEventArgs : EventArgs get { bool temp = false; - GetProperty( Scrollable.Property.OVERSHOOT_ENABLED).Get( ref temp ); + GetProperty( Scrollable.Property.OVERSHOOT_ENABLED).Get( out temp ); return temp; } set @@ -441,7 +395,7 @@ public class CompletedEventArgs : EventArgs get { int temp = 0; - GetProperty( Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get( ref temp ); + GetProperty( Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get( out temp ); return temp; } set @@ -493,7 +447,7 @@ public class CompletedEventArgs : EventArgs get { bool temp = false; - GetProperty( Scrollable.Property.CAN_SCROLL_VERTICAL).Get( ref temp ); + GetProperty( Scrollable.Property.CAN_SCROLL_VERTICAL).Get( out temp ); return temp; } set @@ -506,7 +460,7 @@ public class CompletedEventArgs : EventArgs get { bool temp = false; - GetProperty( Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get( ref temp ); + GetProperty( Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/Size.cs b/plugins/dali-sharp/sharp/public/Size.cs similarity index 99% rename from plugins/dali-sharp/sharp/internal/Size.cs rename to plugins/dali-sharp/sharp/public/Size.cs index 05b83d1..5c8a5f4 100755 --- a/plugins/dali-sharp/sharp/internal/Size.cs +++ b/plugins/dali-sharp/sharp/public/Size.cs @@ -89,7 +89,7 @@ public class Size : global::System.IDisposable { } } - public static Size GetSizeFromPtr(global::System.IntPtr cPtr) { + internal static Size GetSizeFromPtr(global::System.IntPtr cPtr) { Size ret = new Size(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/Size2D.cs b/plugins/dali-sharp/sharp/public/Size2D.cs similarity index 98% rename from plugins/dali-sharp/sharp/internal/Size2D.cs rename to plugins/dali-sharp/sharp/public/Size2D.cs index 9b69912..da7289c 100755 --- a/plugins/dali-sharp/sharp/internal/Size2D.cs +++ b/plugins/dali-sharp/sharp/public/Size2D.cs @@ -89,7 +89,7 @@ public class Size2D : global::System.IDisposable { } } - public static Size2D GetSize2DFromPtr(global::System.IntPtr cPtr) { + internal static Size2D GetSize2DFromPtr(global::System.IntPtr cPtr) { Size2D ret = new Size2D(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/StyleManager.cs b/plugins/dali-sharp/sharp/public/StyleManager.cs similarity index 97% rename from plugins/dali-sharp/sharp/internal/StyleManager.cs rename to plugins/dali-sharp/sharp/public/StyleManager.cs index a9f69d6..e02ccca 100644 --- a/plugins/dali-sharp/sharp/internal/StyleManager.cs +++ b/plugins/dali-sharp/sharp/public/StyleManager.cs @@ -180,12 +180,12 @@ public class StyleChangedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetStyleConstant(string key, Property.Value value) { + public void AddConstant(string key, Property.Value value) { NDalicPINVOKE.StyleManager_SetStyleConstant(swigCPtr, key, Property.Value.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool GetStyleConstant(string key, Property.Value valueOut) { + public bool GetConstant(string key, Property.Value valueOut) { bool ret = NDalicPINVOKE.StyleManager_GetStyleConstant(swigCPtr, key, Property.Value.getCPtr(valueOut)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -196,7 +196,7 @@ public class StyleChangedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public StyleChangedSignal StyleChangedSignal() { + internal StyleChangedSignal StyleChangedSignal() { StyleChangedSignal ret = new StyleChangedSignal(NDalicPINVOKE.StyleManager_StyleChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/TableView.cs b/plugins/dali-sharp/sharp/public/TableView.cs similarity index 77% rename from plugins/dali-sharp/sharp/internal/TableView.cs rename to plugins/dali-sharp/sharp/public/TableView.cs index 7f70d8f..d923ac14 100644 --- a/plugins/dali-sharp/sharp/internal/TableView.cs +++ b/plugins/dali-sharp/sharp/public/TableView.cs @@ -61,82 +61,17 @@ public class TableView : View { } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TableView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_TableView_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get(); public static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get(); public static readonly int CELL_PADDING = NDalicPINVOKE.TableView_Property_CELL_PADDING_get(); public static readonly int LAYOUT_ROWS = NDalicPINVOKE.TableView_Property_LAYOUT_ROWS_get(); public static readonly int LAYOUT_COLUMNS = NDalicPINVOKE.TableView_Property_LAYOUT_COLUMNS_get(); - } - public class ChildProperty : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~ChildProperty() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TableView_ChildProperty(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public ChildProperty() : this(NDalicPINVOKE.new_TableView_ChildProperty(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class ChildProperty + { public static readonly int CELL_INDEX = NDalicPINVOKE.TableView_ChildProperty_CELL_INDEX_get(); public static readonly int ROW_SPAN = NDalicPINVOKE.TableView_ChildProperty_ROW_SPAN_get(); public static readonly int COLUMN_SPAN = NDalicPINVOKE.TableView_ChildProperty_COLUMN_SPAN_get(); @@ -253,13 +188,7 @@ public class TableView : View { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TableView Assign(TableView handle) { - TableView ret = new TableView(NDalicPINVOKE.TableView_Assign(swigCPtr, TableView.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static TableView DownCast(BaseHandle handle) { + internal new static TableView DownCast(BaseHandle handle) { TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -299,11 +228,6 @@ public class TableView : View { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void DeleteRow(uint rowIndex, ViewContainer removed) { - NDalicPINVOKE.TableView_DeleteRow__SWIG_1(swigCPtr, rowIndex, ViewContainer.getCPtr(removed)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void InsertColumn(uint columnIndex) { NDalicPINVOKE.TableView_InsertColumn(swigCPtr, columnIndex); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -314,21 +238,11 @@ public class TableView : View { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void DeleteColumn(uint columnIndex, ViewContainer removed) { - NDalicPINVOKE.TableView_DeleteColumn__SWIG_1(swigCPtr, columnIndex, ViewContainer.getCPtr(removed)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void Resize(uint rows, uint columns) { NDalicPINVOKE.TableView_Resize__SWIG_0(swigCPtr, rows, columns); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Resize(uint rows, uint columns, ViewContainer removed) { - NDalicPINVOKE.TableView_Resize__SWIG_1(swigCPtr, rows, columns, ViewContainer.getCPtr(removed)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void SetCellPadding(Vector2 padding) { NDalicPINVOKE.TableView_SetCellPadding(swigCPtr, Vector2.getCPtr(padding)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -406,30 +320,11 @@ public class TableView : View { return ret; } - public uint GetRows() { - uint ret = NDalicPINVOKE.TableView_GetRows(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public uint GetColumns() { - uint ret = NDalicPINVOKE.TableView_GetColumns(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void SetCellAlignment(TableView.CellPosition position, HorizontalAlignmentType horizontal, VerticalAlignmentType vertical) { NDalicPINVOKE.TableView_SetCellAlignment(swigCPtr, TableView.CellPosition.getCPtr(position), (int)horizontal, (int)vertical); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000, - CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX, - CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX+1000 - } - public enum LayoutPolicy { FIXED, RELATIVE, @@ -442,7 +337,7 @@ public class TableView : View { get { int temp = 0; - GetProperty( TableView.Property.ROWS).Get( ref temp ); + GetProperty( TableView.Property.ROWS).Get( out temp ); return temp; } set @@ -455,7 +350,7 @@ public class TableView : View { get { int temp = 0; - GetProperty( TableView.Property.COLUMNS).Get( ref temp ); + GetProperty( TableView.Property.COLUMNS).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/TapGesture.cs b/plugins/dali-sharp/sharp/public/TapGesture.cs similarity index 89% rename from plugins/dali-sharp/sharp/internal/TapGesture.cs rename to plugins/dali-sharp/sharp/public/TapGesture.cs index 1a45871..fdf158e 100644 --- a/plugins/dali-sharp/sharp/internal/TapGesture.cs +++ b/plugins/dali-sharp/sharp/public/TapGesture.cs @@ -87,16 +87,6 @@ public class TapGesture : Gesture { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TapGesture(TapGesture rhs) : this(NDalicPINVOKE.new_TapGesture__SWIG_1(TapGesture.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public TapGesture Assign(TapGesture rhs) { - TapGesture ret = new TapGesture(NDalicPINVOKE.TapGesture_Assign(swigCPtr, TapGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private uint numberOfTaps { set { NDalicPINVOKE.TapGesture_numberOfTaps_set(swigCPtr, value); diff --git a/plugins/dali-sharp/sharp/internal/TextEditor.cs b/plugins/dali-sharp/sharp/public/TextEditor.cs similarity index 84% rename from plugins/dali-sharp/sharp/internal/TextEditor.cs rename to plugins/dali-sharp/sharp/public/TextEditor.cs index 9cb93fa..33ccacf 100644 --- a/plugins/dali-sharp/sharp/internal/TextEditor.cs +++ b/plugins/dali-sharp/sharp/public/TextEditor.cs @@ -146,47 +146,15 @@ public class TextChangedEventArgs : EventArgs } - public static TextEditor GetTextEditorFromPtr(global::System.IntPtr cPtr) { + internal static TextEditor GetTextEditorFromPtr(global::System.IntPtr cPtr) { TextEditor ret = new TextEditor(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextEditor_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_TextEditor_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextEditor_Property_RENDERING_BACKEND_get(); public static readonly int TEXT = NDalicPINVOKE.TextEditor_Property_TEXT_get(); public static readonly int TEXT_COLOR = NDalicPINVOKE.TextEditor_Property_TEXT_COLOR_get(); @@ -227,44 +195,12 @@ public class TextChangedEventArgs : EventArgs public static readonly int INPUT_EMBOSS = NDalicPINVOKE.TextEditor_Property_INPUT_EMBOSS_get(); public static readonly int OUTLINE = NDalicPINVOKE.TextEditor_Property_OUTLINE_get(); public static readonly int INPUT_OUTLINE = NDalicPINVOKE.TextEditor_Property_INPUT_OUTLINE_get(); - - } - - public class InputStyle : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal InputStyle(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(InputStyle obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~InputStyle() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextEditor_InputStyle(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public InputStyle() : this(NDalicPINVOKE.new_TextEditor_InputStyle(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public enum Mask { + } + + public class InputStyle + { + public enum Mask + { NONE = 0x0000, COLOR = 0x0001, FONT_FAMILY = 0x0002, @@ -276,7 +212,6 @@ public class TextChangedEventArgs : EventArgs EMBOSS = 0x0080, OUTLINE = 0x0100 } - } public TextEditor () : this (NDalicPINVOKE.TextEditor_New(), true) { @@ -287,48 +222,24 @@ public class TextChangedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TextEditor Assign(TextEditor handle) { - TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_Assign(swigCPtr, TextEditor.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static TextEditor DownCast(BaseHandle handle) { + internal new static TextEditor DownCast(BaseHandle handle) { TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public TextEditorSignal TextChangedSignal() { + internal TextEditorSignal TextChangedSignal() { TextEditorSignal ret = new TextEditorSignal(NDalicPINVOKE.TextEditor_TextChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t InputStyleChangedSignal() { + internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t InputStyleChangedSignal() { SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextEditor_Dali__Toolkit__TextEditor__InputStyle__MaskF_t(NDalicPINVOKE.TextEditor_InputStyleChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - - public int RenderingBackend - { - get - { - int temp = 0; - GetProperty( TextEditor.Property.RENDERING_BACKEND).Get( ref temp ); - return temp; - } - set - { - SetProperty( TextEditor.Property.RENDERING_BACKEND, new Dali.Property.Value( value ) ); - } - } public string Text { get @@ -386,7 +297,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.POINT_SIZE).Get( ref temp ); + GetProperty( TextEditor.Property.POINT_SIZE).Get( out temp ); return temp; } set @@ -412,7 +323,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.SCROLL_THRESHOLD).Get( ref temp ); + GetProperty( TextEditor.Property.SCROLL_THRESHOLD).Get( out temp ); return temp; } set @@ -425,7 +336,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.SCROLL_SPEED).Get( ref temp ); + GetProperty( TextEditor.Property.SCROLL_SPEED).Get( out temp ); return temp; } set @@ -464,7 +375,7 @@ public class TextChangedEventArgs : EventArgs get { bool temp = false; - GetProperty( TextEditor.Property.ENABLE_CURSOR_BLINK).Get( ref temp ); + GetProperty( TextEditor.Property.ENABLE_CURSOR_BLINK).Get( out temp ); return temp; } set @@ -477,7 +388,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.CURSOR_BLINK_INTERVAL).Get( ref temp ); + GetProperty( TextEditor.Property.CURSOR_BLINK_INTERVAL).Get( out temp ); return temp; } set @@ -490,7 +401,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.CURSOR_BLINK_DURATION).Get( ref temp ); + GetProperty( TextEditor.Property.CURSOR_BLINK_DURATION).Get( out temp ); return temp; } set @@ -503,7 +414,7 @@ public class TextChangedEventArgs : EventArgs get { int temp = 0; - GetProperty( TextEditor.Property.CURSOR_WIDTH).Get( ref temp ); + GetProperty( TextEditor.Property.CURSOR_WIDTH).Get( out temp ); return temp; } set @@ -646,7 +557,7 @@ public class TextChangedEventArgs : EventArgs get { bool temp = false; - GetProperty( TextEditor.Property.ENABLE_MARKUP).Get( ref temp ); + GetProperty( TextEditor.Property.ENABLE_MARKUP).Get( out temp ); return temp; } set @@ -698,7 +609,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.INPUT_POINT_SIZE).Get( ref temp ); + GetProperty( TextEditor.Property.INPUT_POINT_SIZE).Get( out temp ); return temp; } set @@ -711,7 +622,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.LINE_SPACING).Get( ref temp ); + GetProperty( TextEditor.Property.LINE_SPACING).Get( out temp ); return temp; } set @@ -724,7 +635,7 @@ public class TextChangedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextEditor.Property.INPUT_LINE_SPACING).Get( ref temp ); + GetProperty( TextEditor.Property.INPUT_LINE_SPACING).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/TextField.cs b/plugins/dali-sharp/sharp/public/TextField.cs similarity index 86% rename from plugins/dali-sharp/sharp/internal/TextField.cs rename to plugins/dali-sharp/sharp/public/TextField.cs index 38bb8a9..4c1f0bc 100644 --- a/plugins/dali-sharp/sharp/internal/TextField.cs +++ b/plugins/dali-sharp/sharp/public/TextField.cs @@ -203,47 +203,15 @@ public class MaxLengthReachedEventArgs : EventArgs } - public static TextField GetTextFieldFromPtr(global::System.IntPtr cPtr) { + internal static TextField GetTextFieldFromPtr(global::System.IntPtr cPtr) { TextField ret = new TextField(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextField_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_TextField_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextField_Property_RENDERING_BACKEND_get(); public static readonly int TEXT = NDalicPINVOKE.TextField_Property_TEXT_get(); public static readonly int PLACEHOLDER_TEXT = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_get(); @@ -294,41 +262,10 @@ public class MaxLengthReachedEventArgs : EventArgs } - public class InputStyle : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal InputStyle(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(InputStyle obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~InputStyle() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextField_InputStyle(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public InputStyle() : this(NDalicPINVOKE.new_TextField_InputStyle(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public enum Mask { + public class InputStyle + { + public enum Mask + { NONE = 0x0000, COLOR = 0x0001, FONT_FAMILY = 0x0002, @@ -339,7 +276,6 @@ public class MaxLengthReachedEventArgs : EventArgs EMBOSS = 0x0040, OUTLINE = 0x0080 } - } public TextField () : this (NDalicPINVOKE.TextField_New(), true) { @@ -350,59 +286,35 @@ public class MaxLengthReachedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TextField Assign(TextField handle) { - TextField ret = new TextField(NDalicPINVOKE.TextField_Assign(swigCPtr, TextField.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static TextField DownCast(BaseHandle handle) { + internal new static TextField DownCast(BaseHandle handle) { TextField ret = new TextField(NDalicPINVOKE.TextField_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public TextFieldSignal TextChangedSignal() { + internal TextFieldSignal TextChangedSignal() { TextFieldSignal ret = new TextFieldSignal(NDalicPINVOKE.TextField_TextChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public TextFieldSignal MaxLengthReachedSignal() { + internal TextFieldSignal MaxLengthReachedSignal() { TextFieldSignal ret = new TextFieldSignal(NDalicPINVOKE.TextField_MaxLengthReachedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t InputStyleChangedSignal() { + internal SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t InputStyleChangedSignal() { SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t ret = new SWIGTYPE_p_Dali__SignalT_void_fDali__Toolkit__TextField_Dali__Toolkit__TextField__InputStyle__MaskF_t(NDalicPINVOKE.TextField_InputStyleChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public enum ExceedPolicyType { EXCEED_POLICY_ORIGINAL, EXCEED_POLICY_CLIP } - public int RenderingBackend - { - get - { - int temp = 0; - GetProperty( TextField.Property.RENDERING_BACKEND).Get( ref temp ); - return temp; - } - set - { - SetProperty( TextField.Property.RENDERING_BACKEND, new Dali.Property.Value( value ) ); - } - } public string Text { get @@ -473,7 +385,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextField.Property.POINT_SIZE).Get( ref temp ); + GetProperty( TextField.Property.POINT_SIZE).Get( out temp ); return temp; } set @@ -486,7 +398,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { int temp = 0; - GetProperty( TextField.Property.MAX_LENGTH).Get( ref temp ); + GetProperty( TextField.Property.MAX_LENGTH).Get( out temp ); return temp; } set @@ -499,7 +411,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { int temp = 0; - GetProperty( TextField.Property.EXCEED_POLICY).Get( ref temp ); + GetProperty( TextField.Property.EXCEED_POLICY).Get( out temp ); return temp; } set @@ -616,7 +528,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { bool temp = false; - GetProperty( TextField.Property.ENABLE_CURSOR_BLINK).Get( ref temp ); + GetProperty( TextField.Property.ENABLE_CURSOR_BLINK).Get( out temp ); return temp; } set @@ -629,7 +541,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextField.Property.CURSOR_BLINK_INTERVAL).Get( ref temp ); + GetProperty( TextField.Property.CURSOR_BLINK_INTERVAL).Get( out temp ); return temp; } set @@ -642,7 +554,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextField.Property.CURSOR_BLINK_DURATION).Get( ref temp ); + GetProperty( TextField.Property.CURSOR_BLINK_DURATION).Get( out temp ); return temp; } set @@ -655,7 +567,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { int temp = 0; - GetProperty( TextField.Property.CURSOR_WIDTH).Get( ref temp ); + GetProperty( TextField.Property.CURSOR_WIDTH).Get( out temp ); return temp; } set @@ -694,7 +606,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextField.Property.SCROLL_THRESHOLD).Get( ref temp ); + GetProperty( TextField.Property.SCROLL_THRESHOLD).Get( out temp ); return temp; } set @@ -707,7 +619,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextField.Property.SCROLL_SPEED).Get( ref temp ); + GetProperty( TextField.Property.SCROLL_SPEED).Get( out temp ); return temp; } set @@ -850,7 +762,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { bool temp = false; - GetProperty( TextField.Property.ENABLE_MARKUP).Get( ref temp ); + GetProperty( TextField.Property.ENABLE_MARKUP).Get( out temp ); return temp; } set @@ -889,7 +801,7 @@ public class MaxLengthReachedEventArgs : EventArgs get { float temp = 0.0f; - GetProperty( TextField.Property.INPUT_POINT_SIZE).Get( ref temp ); + GetProperty( TextField.Property.INPUT_POINT_SIZE).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/TextLabel.cs b/plugins/dali-sharp/sharp/public/TextLabel.cs similarity index 81% rename from plugins/dali-sharp/sharp/internal/TextLabel.cs rename to plugins/dali-sharp/sharp/public/TextLabel.cs index ce1f1d8..1ff5471 100644 --- a/plugins/dali-sharp/sharp/internal/TextLabel.cs +++ b/plugins/dali-sharp/sharp/public/TextLabel.cs @@ -61,40 +61,8 @@ public class TextLabel : View { } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextLabel_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_TextLabel_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextLabel_Property_RENDERING_BACKEND_get(); public static readonly int TEXT = NDalicPINVOKE.TextLabel_Property_TEXT_get(); public static readonly int FONT_FAMILY = NDalicPINVOKE.TextLabel_Property_FONT_FAMILY_get(); @@ -119,7 +87,6 @@ public class TextLabel : View { public static readonly int SHADOW = NDalicPINVOKE.TextLabel_Property_SHADOW_get(); public static readonly int EMBOSS = NDalicPINVOKE.TextLabel_Property_EMBOSS_get(); public static readonly int OUTLINE = NDalicPINVOKE.TextLabel_Property_OUTLINE_get(); - } public TextLabel () : this (NDalicPINVOKE.TextLabel_New__SWIG_0(), true) { @@ -134,36 +101,12 @@ public class TextLabel : View { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TextLabel Assign(TextLabel handle) { - TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_Assign(swigCPtr, TextLabel.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static TextLabel DownCast(BaseHandle handle) { + internal new static TextLabel DownCast(BaseHandle handle) { TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - - public int RenderingBackend - { - get - { - int temp = 0; - GetProperty( TextLabel.Property.RENDERING_BACKEND).Get( ref temp ); - return temp; - } - set - { - SetProperty( TextLabel.Property.RENDERING_BACKEND, new Dali.Property.Value( value ) ); - } - } public string Text { get @@ -208,7 +151,7 @@ public class TextLabel : View { get { float temp = 0.0f; - GetProperty( TextLabel.Property.POINT_SIZE).Get( ref temp ); + GetProperty( TextLabel.Property.POINT_SIZE).Get( out temp ); return temp; } set @@ -221,7 +164,7 @@ public class TextLabel : View { get { bool temp = false; - GetProperty( TextLabel.Property.MULTI_LINE).Get( ref temp ); + GetProperty( TextLabel.Property.MULTI_LINE).Get( out temp ); return temp; } set @@ -299,7 +242,7 @@ public class TextLabel : View { get { bool temp = false; - GetProperty( TextLabel.Property.UNDERLINE_ENABLED).Get( ref temp ); + GetProperty( TextLabel.Property.UNDERLINE_ENABLED).Get( out temp ); return temp; } set @@ -325,7 +268,7 @@ public class TextLabel : View { get { float temp = 0.0f; - GetProperty( TextLabel.Property.UNDERLINE_HEIGHT).Get( ref temp ); + GetProperty( TextLabel.Property.UNDERLINE_HEIGHT).Get( out temp ); return temp; } set @@ -338,7 +281,7 @@ public class TextLabel : View { get { bool temp = false; - GetProperty( TextLabel.Property.ENABLE_MARKUP).Get( ref temp ); + GetProperty( TextLabel.Property.ENABLE_MARKUP).Get( out temp ); return temp; } set @@ -351,7 +294,7 @@ public class TextLabel : View { get { bool temp = false; - GetProperty( TextLabel.Property.ENABLE_AUTO_SCROLL).Get( ref temp ); + GetProperty( TextLabel.Property.ENABLE_AUTO_SCROLL).Get( out temp ); return temp; } set @@ -364,7 +307,7 @@ public class TextLabel : View { get { int temp = 0; - GetProperty( TextLabel.Property.AUTO_SCROLL_SPEED).Get( ref temp ); + GetProperty( TextLabel.Property.AUTO_SCROLL_SPEED).Get( out temp ); return temp; } set @@ -377,7 +320,7 @@ public class TextLabel : View { get { int temp = 0; - GetProperty( TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get( ref temp ); + GetProperty( TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get( out temp ); return temp; } set @@ -390,7 +333,7 @@ public class TextLabel : View { get { float temp = 0.0f; - GetProperty( TextLabel.Property.AUTO_SCROLL_GAP).Get( ref temp ); + GetProperty( TextLabel.Property.AUTO_SCROLL_GAP).Get( out temp ); return temp; } set @@ -403,7 +346,7 @@ public class TextLabel : View { get { float temp = 0.0f; - GetProperty( TextLabel.Property.LINE_SPACING).Get( ref temp ); + GetProperty( TextLabel.Property.LINE_SPACING).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/TimePeriod.cs b/plugins/dali-sharp/sharp/public/TimePeriod.cs similarity index 97% rename from plugins/dali-sharp/sharp/internal/TimePeriod.cs rename to plugins/dali-sharp/sharp/public/TimePeriod.cs index b394e4f..f2e47c2 100644 --- a/plugins/dali-sharp/sharp/internal/TimePeriod.cs +++ b/plugins/dali-sharp/sharp/public/TimePeriod.cs @@ -54,7 +54,7 @@ public class TimePeriod : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float delaySeconds { + public float DelaySeconds { set { NDalicPINVOKE.TimePeriod_delaySeconds_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -66,7 +66,7 @@ public class TimePeriod : global::System.IDisposable { } } - public float durationSeconds { + public float DurationSeconds { set { NDalicPINVOKE.TimePeriod_durationSeconds_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/Timer.cs b/plugins/dali-sharp/sharp/public/Timer.cs similarity index 94% rename from plugins/dali-sharp/sharp/internal/Timer.cs rename to plugins/dali-sharp/sharp/public/Timer.cs index 7e57604..055931d 100644 --- a/plugins/dali-sharp/sharp/internal/Timer.cs +++ b/plugins/dali-sharp/sharp/public/Timer.cs @@ -137,13 +137,7 @@ public class Timer : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Timer Assign(Timer timer) { - Timer ret = new Timer(NDalicPINVOKE.Timer_Assign(swigCPtr, Timer.getCPtr(timer)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Timer DownCast(BaseHandle handle) { + internal static Timer DownCast(BaseHandle handle) { Timer ret = new Timer(NDalicPINVOKE.Timer_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -176,7 +170,7 @@ public class Timer : BaseHandle { return ret; } - public TimerSignalType TickSignal() { + internal TimerSignalType TickSignal() { TimerSignalType ret = new TimerSignalType(NDalicPINVOKE.Timer_TickSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/ToggleButton.cs b/plugins/dali-sharp/sharp/public/ToggleButton.cs similarity index 69% rename from plugins/dali-sharp/sharp/internal/ToggleButton.cs rename to plugins/dali-sharp/sharp/public/ToggleButton.cs index c4b3293..9d24fd7 100644 --- a/plugins/dali-sharp/sharp/internal/ToggleButton.cs +++ b/plugins/dali-sharp/sharp/public/ToggleButton.cs @@ -61,44 +61,11 @@ public class ToggleButton : Button { } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_ToggleButton_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_ToggleButton_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int STATE_VISUALS = NDalicPINVOKE.ToggleButton_Property_STATE_VISUALS_get(); public static readonly int TOOLTIPS = NDalicPINVOKE.ToggleButton_Property_TOOLTIPS_get(); public static readonly int CURRENT_STATE_INDEX = NDalicPINVOKE.ToggleButton_Property_CURRENT_STATE_INDEX_get(); - } public ToggleButton () : this (NDalicPINVOKE.ToggleButton_New(), true) { @@ -109,23 +76,12 @@ public class ToggleButton : Button { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ToggleButton Assign(ToggleButton toggleButton) { - ToggleButton ret = new ToggleButton(NDalicPINVOKE.ToggleButton_Assign(swigCPtr, ToggleButton.getCPtr(toggleButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ToggleButton DownCast(BaseHandle handle) { + internal new static ToggleButton DownCast(BaseHandle handle) { ToggleButton ret = new ToggleButton(NDalicPINVOKE.ToggleButton_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX+1000 - } - public Dali.Property.Array StateVisuals { get @@ -157,7 +113,7 @@ public class ToggleButton : Button { get { int temp = 0; - GetProperty( ToggleButton.Property.CURRENT_STATE_INDEX).Get( ref temp ); + GetProperty( ToggleButton.Property.CURRENT_STATE_INDEX).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/Touch.cs b/plugins/dali-sharp/sharp/public/Touch.cs similarity index 93% rename from plugins/dali-sharp/sharp/internal/Touch.cs rename to plugins/dali-sharp/sharp/public/Touch.cs index 5bbf844..ce55eb8 100644 --- a/plugins/dali-sharp/sharp/internal/Touch.cs +++ b/plugins/dali-sharp/sharp/public/Touch.cs @@ -45,7 +45,7 @@ public class Touch : BaseHandle { } - public static Touch GetTouchFromPtr(global::System.IntPtr cPtr) { + internal static Touch GetTouchFromPtr(global::System.IntPtr cPtr) { Touch ret = new Touch(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -59,12 +59,6 @@ public class Touch : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Touch Assign(Touch other) { - Touch ret = new Touch(NDalicPINVOKE.Touch_Assign(swigCPtr, Touch.getCPtr(other)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public uint GetTime() { uint ret = NDalicPINVOKE.Touch_GetTime(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/TouchPoint.cs b/plugins/dali-sharp/sharp/public/TouchPoint.cs similarity index 86% rename from plugins/dali-sharp/sharp/internal/TouchPoint.cs rename to plugins/dali-sharp/sharp/public/TouchPoint.cs index f4428fb..4b27649 100644 --- a/plugins/dali-sharp/sharp/internal/TouchPoint.cs +++ b/plugins/dali-sharp/sharp/public/TouchPoint.cs @@ -46,15 +46,15 @@ public class TouchPoint : global::System.IDisposable { } - public TouchPoint(int id, TouchPoint.State state, float screenX, float screenY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_0(id, (int)state, screenX, screenY), true) { + public TouchPoint(int id, TouchPoint.StateType state, float screenX, float screenY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_0(id, (int)state, screenX, screenY), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TouchPoint(int id, TouchPoint.State state, float screenX, float screenY, float localX, float localY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_1(id, (int)state, screenX, screenY, localX, localY), true) { + public TouchPoint(int id, TouchPoint.StateType state, float screenX, float screenY, float localX, float localY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_1(id, (int)state, screenX, screenY, localX, localY), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public int deviceId { + public int DeviceId { set { NDalicPINVOKE.TouchPoint_deviceId_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -66,19 +66,19 @@ public class TouchPoint : global::System.IDisposable { } } - public TouchPoint.State state { + public TouchPoint.StateType State { set { NDalicPINVOKE.TouchPoint_state_set(swigCPtr, (int)value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } get { - TouchPoint.State ret = (TouchPoint.State)NDalicPINVOKE.TouchPoint_state_get(swigCPtr); + TouchPoint.StateType ret = (TouchPoint.StateType)NDalicPINVOKE.TouchPoint_state_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } } - public View hitView { + public View HitView { set { NDalicPINVOKE.TouchPoint_hitActor_set(swigCPtr, View.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -91,7 +91,7 @@ public class TouchPoint : global::System.IDisposable { } } - public Vector2 local { + public Vector2 Local { set { NDalicPINVOKE.TouchPoint_local_set(swigCPtr, Vector2.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -104,7 +104,7 @@ public class TouchPoint : global::System.IDisposable { } } - public Vector2 screen { + public Vector2 Screen { set { NDalicPINVOKE.TouchPoint_screen_set(swigCPtr, Vector2.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -117,7 +117,7 @@ public class TouchPoint : global::System.IDisposable { } } - public enum State { + public enum StateType { Started, Finished, Down = Started, diff --git a/plugins/dali-sharp/sharp/internal/TransitionData.cs b/plugins/dali-sharp/sharp/public/TransitionData.cs similarity index 87% rename from plugins/dali-sharp/sharp/internal/TransitionData.cs rename to plugins/dali-sharp/sharp/public/TransitionData.cs index 0c7189e..c179edb 100644 --- a/plugins/dali-sharp/sharp/internal/TransitionData.cs +++ b/plugins/dali-sharp/sharp/public/TransitionData.cs @@ -69,7 +69,7 @@ public class TransitionData : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static TransitionData DownCast(BaseHandle handle) { + internal static TransitionData DownCast(BaseHandle handle) { TransitionData ret = new TransitionData(NDalicPINVOKE.TransitionData_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -79,12 +79,6 @@ public class TransitionData : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TransitionData Assign(TransitionData handle) { - TransitionData ret = new TransitionData(NDalicPINVOKE.TransitionData_Assign(swigCPtr, TransitionData.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public uint Count() { uint ret = NDalicPINVOKE.TransitionData_Count(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -97,7 +91,7 @@ public class TransitionData : BaseHandle { return ret; } - public TransitionData(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData impl) : this(NDalicPINVOKE.new_TransitionData__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.getCPtr(impl)), true) { + internal TransitionData(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData impl) : this(NDalicPINVOKE.new_TransitionData__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__TransitionData.getCPtr(impl)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/TypeInfo.cs b/plugins/dali-sharp/sharp/public/TypeInfo.cs similarity index 68% rename from plugins/dali-sharp/sharp/internal/TypeInfo.cs rename to plugins/dali-sharp/sharp/public/TypeInfo.cs index d5afa54..db34ebd 100644 --- a/plugins/dali-sharp/sharp/internal/TypeInfo.cs +++ b/plugins/dali-sharp/sharp/public/TypeInfo.cs @@ -53,12 +53,6 @@ public class TypeInfo : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TypeInfo Assign(TypeInfo rhs) { - TypeInfo ret = new TypeInfo(NDalicPINVOKE.TypeInfo_Assign(swigCPtr, TypeInfo.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public string GetName() { string ret = NDalicPINVOKE.TypeInfo_GetName(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -77,41 +71,12 @@ public class TypeInfo : BaseHandle { return ret; } - public uint GetActionCount() { - uint ret = NDalicPINVOKE.TypeInfo_GetActionCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public string GetActionName(uint index) { - string ret = NDalicPINVOKE.TypeInfo_GetActionName(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public uint GetSignalCount() { - uint ret = NDalicPINVOKE.TypeInfo_GetSignalCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public string GetSignalName(uint index) { - string ret = NDalicPINVOKE.TypeInfo_GetSignalName(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public uint GetPropertyCount() { uint ret = NDalicPINVOKE.TypeInfo_GetPropertyCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void GetPropertyIndices(VectorInteger indices) { - NDalicPINVOKE.TypeInfo_GetPropertyIndices(swigCPtr, VectorInteger.getCPtr(indices)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public string GetPropertyName(int index) { string ret = NDalicPINVOKE.TypeInfo_GetPropertyName(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/TypeRegistry.cs b/plugins/dali-sharp/sharp/public/TypeRegistry.cs similarity index 92% rename from plugins/dali-sharp/sharp/internal/TypeRegistry.cs rename to plugins/dali-sharp/sharp/public/TypeRegistry.cs index c431c87..56eb49c 100644 --- a/plugins/dali-sharp/sharp/internal/TypeRegistry.cs +++ b/plugins/dali-sharp/sharp/public/TypeRegistry.cs @@ -65,7 +65,7 @@ public class TypeRegistry : BaseHandle { return ret; } - public TypeInfo GetTypeInfo(SWIGTYPE_p_std__type_info registerType) { + internal TypeInfo GetTypeInfo(SWIGTYPE_p_std__type_info registerType) { TypeInfo ret = new TypeInfo(NDalicPINVOKE.TypeRegistry_GetTypeInfo__SWIG_1(swigCPtr, SWIGTYPE_p_std__type_info.getCPtr(registerType)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -83,7 +83,7 @@ public class TypeRegistry : BaseHandle { return ret; } - public TypeRegistry(SWIGTYPE_p_Dali__Internal__TypeRegistry typeRegistry) : this(NDalicPINVOKE.new_TypeRegistry__SWIG_2(SWIGTYPE_p_Dali__Internal__TypeRegistry.getCPtr(typeRegistry)), true) { + internal TypeRegistry(SWIGTYPE_p_Dali__Internal__TypeRegistry typeRegistry) : this(NDalicPINVOKE.new_TypeRegistry__SWIG_2(SWIGTYPE_p_Dali__Internal__TypeRegistry.getCPtr(typeRegistry)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/Uint16Pair.cs b/plugins/dali-sharp/sharp/public/Uint16Pair.cs similarity index 96% rename from plugins/dali-sharp/sharp/internal/Uint16Pair.cs rename to plugins/dali-sharp/sharp/public/Uint16Pair.cs index d444f92..64dcd09 100644 --- a/plugins/dali-sharp/sharp/internal/Uint16Pair.cs +++ b/plugins/dali-sharp/sharp/public/Uint16Pair.cs @@ -116,25 +116,25 @@ public class Uint16Pair : global::System.IDisposable { return ret; } - public bool EqualTo(Uint16Pair rhs) { + private bool EqualTo(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_EqualTo(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool NotEqualTo(Uint16Pair rhs) { + private bool NotEqualTo(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_NotEqualTo(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool LessThan(Uint16Pair rhs) { + private bool LessThan(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_LessThan(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool GreaterThan(Uint16Pair rhs) { + private bool GreaterThan(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_GreaterThan(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/plugins/dali-sharp/sharp/internal/Vector2.cs b/plugins/dali-sharp/sharp/public/Vector2.cs similarity index 88% rename from plugins/dali-sharp/sharp/internal/Vector2.cs rename to plugins/dali-sharp/sharp/public/Vector2.cs index 0ce99cd..197c60c 100644 --- a/plugins/dali-sharp/sharp/internal/Vector2.cs +++ b/plugins/dali-sharp/sharp/public/Vector2.cs @@ -82,7 +82,7 @@ public class Vector2 : global::System.IDisposable { } } - public static Vector2 GetVector2FromPtr(global::System.IntPtr cPtr) { + internal static Vector2 GetVector2FromPtr(global::System.IntPtr cPtr) { Vector2 ret = new Vector2(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -163,24 +163,6 @@ public class Vector2 : global::System.IDisposable { } } - public Vector2 Assign(float[] array) { - Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_0(swigCPtr, array), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector2 Assign(Vector3 rhs) { - Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_1(swigCPtr, Vector3.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector2 Assign(Vector4 rhs) { - Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public Vector2 Add(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Add(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -193,85 +175,85 @@ public class Vector2 : global::System.IDisposable { return ret; } - public Vector2 Subtract(Vector2 rhs) { + private Vector2 Subtract(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 SubtractAssign(Vector2 rhs) { + private Vector2 SubtractAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_SubtractAssign(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 Multiply(Vector2 rhs) { + private Vector2 Multiply(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 Multiply(float rhs) { + private Vector2 Multiply(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 MultiplyAssign(Vector2 rhs) { + private Vector2 MultiplyAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 MultiplyAssign(float rhs) { + private Vector2 MultiplyAssign(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 Divide(Vector2 rhs) { + private Vector2 Divide(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 Divide(float rhs) { + private Vector2 Divide(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 DivideAssign(Vector2 rhs) { + private Vector2 DivideAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 DivideAssign(float rhs) { + private Vector2 DivideAssign(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector2 Subtract() { + private Vector2 Subtract() { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_1(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool EqualTo(Vector2 rhs) { + private bool EqualTo(Vector2 rhs) { bool ret = NDalicPINVOKE.Vector2_EqualTo(swigCPtr, Vector2.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool NotEqualTo(Vector2 rhs) { + private bool NotEqualTo(Vector2 rhs) { bool ret = NDalicPINVOKE.Vector2_NotEqualTo(swigCPtr, Vector2.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public float ValueOfIndex(uint index) { + private float ValueOfIndex(uint index) { float ret = NDalicPINVOKE.Vector2_ValueOfIndex__SWIG_0(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -299,7 +281,7 @@ public class Vector2 : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_float AsFloat() { + internal SWIGTYPE_p_float AsFloat() { global::System.IntPtr cPtr = NDalicPINVOKE.Vector2_AsFloat__SWIG_0(swigCPtr); SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/Vector3.cs b/plugins/dali-sharp/sharp/public/Vector3.cs similarity index 90% rename from plugins/dali-sharp/sharp/internal/Vector3.cs rename to plugins/dali-sharp/sharp/public/Vector3.cs index 468d904..52af0de 100644 --- a/plugins/dali-sharp/sharp/internal/Vector3.cs +++ b/plugins/dali-sharp/sharp/public/Vector3.cs @@ -82,7 +82,7 @@ public class Vector3 : global::System.IDisposable { } } - public static Vector3 GetVector3FromPtr(global::System.IntPtr cPtr) { + internal static Vector3 GetVector3FromPtr(global::System.IntPtr cPtr) { Vector3 ret = new Vector3(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -181,121 +181,103 @@ public class Vector3 : global::System.IDisposable { } } - public Vector3 Assign(float[] array) { - Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_0(swigCPtr, array), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector3 Assign(Vector2 rhs) { - Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector3 Assign(Vector4 rhs) { - Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector3 Add(Vector3 rhs) { + private Vector3 Add(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Add(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 AddAssign(Vector3 rhs) { + private Vector3 AddAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_AddAssign(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 Subtract(Vector3 rhs) { + private Vector3 Subtract(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 SubtractAssign(Vector3 rhs) { + private Vector3 SubtractAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_SubtractAssign(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 Multiply(Vector3 rhs) { + private Vector3 Multiply(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 Multiply(float rhs) { + private Vector3 Multiply(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 MultiplyAssign(Vector3 rhs) { + private Vector3 MultiplyAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 MultiplyAssign(float rhs) { + private Vector3 MultiplyAssign(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 MultiplyAssign(Rotation rhs) { + private Vector3 MultiplyAssign(Rotation rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_2(swigCPtr, Rotation.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 Divide(Vector3 rhs) { + private Vector3 Divide(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 Divide(float rhs) { + private Vector3 Divide(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 DivideAssign(Vector3 rhs) { + private Vector3 DivideAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 DivideAssign(float rhs) { + private Vector3 DivideAssign(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector3 Subtract() { + private Vector3 Subtract() { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool EqualTo(Vector3 rhs) { + private bool EqualTo(Vector3 rhs) { bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Vector3.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool NotEqualTo(Vector3 rhs) { + private bool NotEqualTo(Vector3 rhs) { bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Vector3.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public float ValueOfIndex(uint index) { + private float ValueOfIndex(uint index) { float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -335,7 +317,7 @@ public class Vector3 : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_float AsFloat() { + internal SWIGTYPE_p_float AsFloat() { global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_AsFloat__SWIG_0(swigCPtr); SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -378,7 +360,7 @@ public class Vector3 : global::System.IDisposable { } } - public float r { + public float R { set { NDalicPINVOKE.Vector3_r_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -414,7 +396,7 @@ public class Vector3 : global::System.IDisposable { } } - public float g { + public float G { set { NDalicPINVOKE.Vector3_g_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -450,7 +432,7 @@ public class Vector3 : global::System.IDisposable { } } - public float b { + public float B { set { NDalicPINVOKE.Vector3_b_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/Vector4.cs b/plugins/dali-sharp/sharp/public/Vector4.cs similarity index 90% rename from plugins/dali-sharp/sharp/internal/Vector4.cs rename to plugins/dali-sharp/sharp/public/Vector4.cs index 80c03f4..fdfc79d 100644 --- a/plugins/dali-sharp/sharp/internal/Vector4.cs +++ b/plugins/dali-sharp/sharp/public/Vector4.cs @@ -82,7 +82,7 @@ public class Vector4 : global::System.IDisposable { } } - public static Vector4 GetVector4FromPtr(global::System.IntPtr cPtr) { + internal static Vector4 GetVector4FromPtr(global::System.IntPtr cPtr) { Vector4 ret = new Vector4(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -154,115 +154,97 @@ public class Vector4 : global::System.IDisposable { } } - public Vector4 Assign(float[] array) { - Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_0(swigCPtr, array), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector4 Assign(Vector2 vec2) { - Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(vec2)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector4 Assign(Vector3 vec3) { - Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_2(swigCPtr, Vector3.getCPtr(vec3)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector4 Add(Vector4 rhs) { + private Vector4 Add(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Add(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 AddAssign(Vector4 rhs) { + private Vector4 AddAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_AddAssign(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 Subtract(Vector4 rhs) { + private Vector4 Subtract(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 SubtractAssign(Vector4 rhs) { + private Vector4 SubtractAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_SubtractAssign(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 Multiply(Vector4 rhs) { + private Vector4 Multiply(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 Multiply(float rhs) { + private Vector4 Multiply(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 MultiplyAssign(Vector4 rhs) { + private Vector4 MultiplyAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 MultiplyAssign(float rhs) { + private Vector4 MultiplyAssign(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 Divide(Vector4 rhs) { + private Vector4 Divide(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 Divide(float rhs) { + private Vector4 Divide(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 DivideAssign(Vector4 rhs) { + private Vector4 DivideAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 DivideAssign(float rhs) { + private Vector4 DivideAssign(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Vector4 Subtract() { + private Vector4 Subtract() { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_1(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool EqualTo(Vector4 rhs) { + private bool EqualTo(Vector4 rhs) { bool ret = NDalicPINVOKE.Vector4_EqualTo(swigCPtr, Vector4.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool NotEqualTo(Vector4 rhs) { + private bool NotEqualTo(Vector4 rhs) { bool ret = NDalicPINVOKE.Vector4_NotEqualTo(swigCPtr, Vector4.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public float ValueOfIndex(uint index) { + private float ValueOfIndex(uint index) { float ret = NDalicPINVOKE.Vector4_ValueOfIndex__SWIG_0(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -314,7 +296,7 @@ public class Vector4 : global::System.IDisposable { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_float AsFloat() { + internal SWIGTYPE_p_float AsFloat() { global::System.IntPtr cPtr = NDalicPINVOKE.Vector4_AsFloat__SWIG_0(swigCPtr); SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -333,7 +315,7 @@ public class Vector4 : global::System.IDisposable { } } - public float r { + public float R { set { NDalicPINVOKE.Vector4_r_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -345,7 +327,7 @@ public class Vector4 : global::System.IDisposable { } } - public float s { + public float S { set { NDalicPINVOKE.Vector4_s_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -369,7 +351,7 @@ public class Vector4 : global::System.IDisposable { } } - public float g { + public float G { set { NDalicPINVOKE.Vector4_g_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -381,7 +363,7 @@ public class Vector4 : global::System.IDisposable { } } - public float t { + public float T { set { NDalicPINVOKE.Vector4_t_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -405,7 +387,7 @@ public class Vector4 : global::System.IDisposable { } } - public float b { + public float B { set { NDalicPINVOKE.Vector4_b_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -417,7 +399,7 @@ public class Vector4 : global::System.IDisposable { } } - public float p { + public float P { set { NDalicPINVOKE.Vector4_p_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -441,7 +423,7 @@ public class Vector4 : global::System.IDisposable { } } - public float a { + public float A { set { NDalicPINVOKE.Vector4_a_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -453,7 +435,7 @@ public class Vector4 : global::System.IDisposable { } } - public float q { + public float Q { set { NDalicPINVOKE.Vector4_q_set(swigCPtr, value); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/VideoView.cs b/plugins/dali-sharp/sharp/public/VideoView.cs similarity index 80% rename from plugins/dali-sharp/sharp/internal/VideoView.cs rename to plugins/dali-sharp/sharp/public/VideoView.cs index b6f392f..0d892c9 100644 --- a/plugins/dali-sharp/sharp/internal/VideoView.cs +++ b/plugins/dali-sharp/sharp/public/VideoView.cs @@ -148,47 +148,15 @@ public class FinishedEventArgs : EventArgs } } - public static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr) { + internal static VideoView GetVideoViewFromPtr(global::System.IntPtr cPtr) { VideoView ret = new VideoView(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public class Property : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() { - Dispose(); - } - - public virtual void Dispose() { - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_VideoView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public Property() : this(NDalicPINVOKE.new_VideoView_Property(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - + public class Property + { public static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get(); public static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get(); public static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get(); @@ -208,13 +176,7 @@ public class FinishedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public VideoView Assign(VideoView videoView) { - VideoView ret = new VideoView(NDalicPINVOKE.VideoView_Assign(swigCPtr, VideoView.getCPtr(videoView)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static VideoView DownCast(BaseHandle handle) { + internal new static VideoView DownCast(BaseHandle handle) { VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -245,16 +207,12 @@ public class FinishedEventArgs : EventArgs if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public VideoViewSignal FinishedSignal() { + internal VideoViewSignal FinishedSignal() { VideoViewSignal ret = new VideoViewSignal(NDalicPINVOKE.VideoView_FinishedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX - } - public Dali.Property.Map Video { get @@ -273,7 +231,7 @@ public class FinishedEventArgs : EventArgs get { bool temp = false; - GetProperty( VideoView.Property.LOOPING).Get( ref temp ); + GetProperty( VideoView.Property.LOOPING).Get( out temp ); return temp; } set @@ -286,7 +244,7 @@ public class FinishedEventArgs : EventArgs get { bool temp = false; - GetProperty( VideoView.Property.MUTED).Get( ref temp ); + GetProperty( VideoView.Property.MUTED).Get( out temp ); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/View.cs b/plugins/dali-sharp/sharp/public/View.cs similarity index 74% rename from plugins/dali-sharp/sharp/internal/View.cs rename to plugins/dali-sharp/sharp/public/View.cs index a805550..0754862 100755 --- a/plugins/dali-sharp/sharp/internal/View.cs +++ b/plugins/dali-sharp/sharp/public/View.cs @@ -424,7 +424,7 @@ namespace Dali * (in the type of KeyInputFocusGainedEventHandler-DaliEventHandler) * provided by the user. KeyInputFocusGained signal is emitted when the control gets Key Input Focus. */ - public event DaliEventHandler KeyInputFocusGained + public event DaliEventHandler FocusGained { add { @@ -435,7 +435,7 @@ namespace Dali { _KeyInputFocusGainedEventHandler += value; Console.WriteLine("View Key EVENT Locked...."); - _KeyInputFocusGainedCallbackDelegate = new KeyInputFocusGainedCallbackDelegate(OnKeyInputFocusGained); + _KeyInputFocusGainedCallbackDelegate = new KeyInputFocusGainedCallbackDelegate(OnFocusGained); this.KeyInputFocusGainedSignal().Connect(_KeyInputFocusGainedCallbackDelegate); } } @@ -455,7 +455,7 @@ namespace Dali } } - private void OnKeyInputFocusGained(IntPtr view) + private void OnFocusGained(IntPtr view) { KeyInputFocusGainedEventArgs e = new KeyInputFocusGainedEventArgs(); Console.WriteLine("View Key ...."); @@ -475,7 +475,7 @@ namespace Dali * (in the type of KeyInputFocusLostEventHandler-DaliEventHandler) * provided by the user. KeyInputFocusLost signal is emitted when the control loses Key Input Focus. */ - public event DaliEventHandler KeyInputFocusLost + public event DaliEventHandler FocusLost { add { @@ -486,7 +486,7 @@ namespace Dali { _KeyInputFocusLostEventHandler += value; - _KeyInputFocusLostCallbackDelegate = new KeyInputFocusLostCallbackDelegate(OnKeyInputFocusLost); + _KeyInputFocusLostCallbackDelegate = new KeyInputFocusLostCallbackDelegate(OnFocusLost); this.KeyInputFocusLostSignal().Connect(_KeyInputFocusLostCallbackDelegate); } } @@ -506,7 +506,7 @@ namespace Dali } } - private void OnKeyInputFocusLost(IntPtr view) + private void OnFocusLost(IntPtr view) { KeyInputFocusLostEventArgs e = new KeyInputFocusLostEventArgs(); @@ -578,7 +578,7 @@ namespace Dali * (in the type of OnRelayoutEventHandler) provided by the user. * OnRelayout signal is emitted after the size has been set on the view during relayout. */ - public event DaliEventHandler OnRelayoutEvent + public event DaliEventHandler Relayout { add { @@ -737,7 +737,7 @@ namespace Dali * (in the type of WheelHandler-DaliEventHandlerWithReturnType) * provided by the user. WheelMoved signal is emitted when wheel event is received. */ - public event DaliEventHandlerWithReturnType WheelMoved + public event DaliEventHandlerWithReturnType WheelRolled { add { @@ -791,7 +791,7 @@ namespace Dali * (in the type of OnWindowEventHandler) provided by the user. * OnWindow signal is emitted after the view has been connected to the window. */ - public event DaliEventHandler OnWindowEvent + public event DaliEventHandler AddedToWindow { add { @@ -844,7 +844,7 @@ namespace Dali * (in the type of OffWindowEventHandler) provided by the user. * OffWindow signal is emitted after the view has been disconnected from the window. */ - public event DaliEventHandler OffWindowEvent + public event DaliEventHandler RemovedFromWindow { add { @@ -890,7 +890,7 @@ namespace Dali } } - public static View GetViewFromPtr(global::System.IntPtr cPtr) + internal static View GetViewFromPtr(global::System.IntPtr cPtr) { View ret = new View(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -898,175 +898,85 @@ namespace Dali return ret; } - public IntPtr GetPtrfromView() + internal IntPtr GetPtrfromView() { return (IntPtr)swigCPtr; } - public class Property : global::System.IDisposable + public class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; + internal static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get(); + internal static readonly int STATE = NDalicManualPINVOKE.View_Property_STATE_get(); + internal static readonly int SUB_STATE = NDalicManualPINVOKE.View_Property_SUB_STATE_get(); + internal static readonly int LEFT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_LEFT_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int RIGHT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int UP_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_UP_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int DOWN_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_DOWN_FOCUSABLE_ACTOR_ID_get(); + internal static readonly int KEY_INPUT_FOCUS = NDalicPINVOKE.View_Property_KEY_INPUT_FOCUS_get(); + internal static readonly int STYLE_NAME = NDalicPINVOKE.View_Property_STYLE_NAME_get(); + internal static readonly int BACKGROUND = NDalicPINVOKE.View_Property_BACKGROUND_get(); - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Property() - { - Dispose(); - } - public virtual void Dispose() - { - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_View_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get(); - public static readonly int STATE = NDalicManualPINVOKE.View_Property_STATE_get(); - public static readonly int SUB_STATE = NDalicManualPINVOKE.View_Property_SUB_STATE_get(); - public static readonly int LEFT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_LEFT_FOCUSABLE_ACTOR_ID_get(); - public static readonly int RIGHT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get(); - public static readonly int UP_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_UP_FOCUSABLE_ACTOR_ID_get(); - public static readonly int DOWN_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_DOWN_FOCUSABLE_ACTOR_ID_get(); - - public Property() : this(NDalicPINVOKE.new_View_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static readonly int STYLE_NAME = NDalicPINVOKE.View_Property_STYLE_NAME_get(); - public static readonly int BACKGROUND_COLOR = NDalicPINVOKE.View_Property_BACKGROUND_COLOR_get(); - public static readonly int BACKGROUND_IMAGE = NDalicPINVOKE.View_Property_BACKGROUND_IMAGE_get(); - public static readonly int KEY_INPUT_FOCUS = NDalicPINVOKE.View_Property_KEY_INPUT_FOCUS_get(); - public static readonly int BACKGROUND = NDalicPINVOKE.View_Property_BACKGROUND_get(); - - - public static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get(); + internal static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get(); public static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get(); - public static readonly int SCREEN_POSITION = NDalicManualPINVOKE.Actor_Property_SCREEN_POSITION_get(); - public static readonly int POSITION_USES_ANCHOR_POINT = NDalicManualPINVOKE.Actor_Property_POSITION_USES_ANCHOR_POINT_get(); - public static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get(); - public static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get(); - public static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get(); - public static readonly int PARENT_ORIGIN_Z = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Z_get(); - public static readonly int ANCHOR_POINT = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_get(); - public static readonly int ANCHOR_POINT_X = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_X_get(); - public static readonly int ANCHOR_POINT_Y = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Y_get(); - public static readonly int ANCHOR_POINT_Z = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Z_get(); + internal static readonly int SCREEN_POSITION = NDalicManualPINVOKE.Actor_Property_SCREEN_POSITION_get(); + internal static readonly int POSITION_USES_ANCHOR_POINT = NDalicManualPINVOKE.Actor_Property_POSITION_USES_ANCHOR_POINT_get(); + internal static readonly int PARENT_ORIGIN = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_get(); + internal static readonly int PARENT_ORIGIN_X = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_X_get(); + internal static readonly int PARENT_ORIGIN_Y = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Y_get(); + internal static readonly int PARENT_ORIGIN_Z = NDalicPINVOKE.Actor_Property_PARENT_ORIGIN_Z_get(); + internal static readonly int ANCHOR_POINT = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_get(); + internal static readonly int ANCHOR_POINT_X = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_X_get(); + internal static readonly int ANCHOR_POINT_Y = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Y_get(); + internal static readonly int ANCHOR_POINT_Z = NDalicPINVOKE.Actor_Property_ANCHOR_POINT_Z_get(); public static readonly int SIZE = NDalicPINVOKE.Actor_Property_SIZE_get(); public static readonly int SIZE_WIDTH = NDalicPINVOKE.Actor_Property_SIZE_WIDTH_get(); public static readonly int SIZE_HEIGHT = NDalicPINVOKE.Actor_Property_SIZE_HEIGHT_get(); - public static readonly int SIZE_DEPTH = NDalicPINVOKE.Actor_Property_SIZE_DEPTH_get(); + internal static readonly int SIZE_DEPTH = NDalicPINVOKE.Actor_Property_SIZE_DEPTH_get(); public static readonly int POSITION = NDalicPINVOKE.Actor_Property_POSITION_get(); public static readonly int POSITION_X = NDalicPINVOKE.Actor_Property_POSITION_X_get(); public static readonly int POSITION_Y = NDalicPINVOKE.Actor_Property_POSITION_Y_get(); public static readonly int POSITION_Z = NDalicPINVOKE.Actor_Property_POSITION_Z_get(); - public static readonly int WORLD_POSITION = NDalicPINVOKE.Actor_Property_WORLD_POSITION_get(); - public static readonly int WORLD_POSITION_X = NDalicPINVOKE.Actor_Property_WORLD_POSITION_X_get(); - public static readonly int WORLD_POSITION_Y = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Y_get(); - public static readonly int WORLD_POSITION_Z = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Z_get(); + internal static readonly int WORLD_POSITION = NDalicPINVOKE.Actor_Property_WORLD_POSITION_get(); + internal static readonly int WORLD_POSITION_X = NDalicPINVOKE.Actor_Property_WORLD_POSITION_X_get(); + internal static readonly int WORLD_POSITION_Y = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Y_get(); + internal static readonly int WORLD_POSITION_Z = NDalicPINVOKE.Actor_Property_WORLD_POSITION_Z_get(); public static readonly int ORIENTATION = NDalicPINVOKE.Actor_Property_ORIENTATION_get(); - public static readonly int WORLD_ORIENTATION = NDalicPINVOKE.Actor_Property_WORLD_ORIENTATION_get(); + internal static readonly int WORLD_ORIENTATION = NDalicPINVOKE.Actor_Property_WORLD_ORIENTATION_get(); public static readonly int SCALE = NDalicPINVOKE.Actor_Property_SCALE_get(); public static readonly int SCALE_X = NDalicPINVOKE.Actor_Property_SCALE_X_get(); public static readonly int SCALE_Y = NDalicPINVOKE.Actor_Property_SCALE_Y_get(); public static readonly int SCALE_Z = NDalicPINVOKE.Actor_Property_SCALE_Z_get(); - public static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get(); + internal static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get(); public static readonly int VISIBLE = NDalicPINVOKE.Actor_Property_VISIBLE_get(); public static readonly int COLOR = NDalicPINVOKE.Actor_Property_COLOR_get(); public static readonly int COLOR_RED = NDalicPINVOKE.Actor_Property_COLOR_RED_get(); public static readonly int COLOR_GREEN = NDalicPINVOKE.Actor_Property_COLOR_GREEN_get(); public static readonly int COLOR_BLUE = NDalicPINVOKE.Actor_Property_COLOR_BLUE_get(); public static readonly int COLOR_ALPHA = NDalicPINVOKE.Actor_Property_COLOR_ALPHA_get(); - public static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get(); - public static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get(); - public static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get(); - public static readonly int SENSITIVE = NDalicPINVOKE.Actor_Property_SENSITIVE_get(); - public static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get(); - public static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get(); - public static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get(); - public static readonly int COLOR_MODE = NDalicPINVOKE.Actor_Property_COLOR_MODE_get(); - public static readonly int POSITION_INHERITANCE = NDalicPINVOKE.Actor_Property_POSITION_INHERITANCE_get(); - public static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get(); - public static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get(); - public static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get(); - public static readonly int HEIGHT_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_HEIGHT_RESIZE_POLICY_get(); - public static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get(); - public static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get(); - public static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get(); - public static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get(); - public static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get(); - public static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get(); - public static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get(); - public static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get(); - - } - - public class KeyboardFocus : global::System.IDisposable + internal static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get(); + internal static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get(); + internal static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get(); + internal static readonly int SENSITIVE = NDalicPINVOKE.Actor_Property_SENSITIVE_get(); + internal static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get(); + internal static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get(); + internal static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get(); + internal static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get(); + internal static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get(); + internal static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get(); + internal static readonly int HEIGHT_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_HEIGHT_RESIZE_POLICY_get(); + internal static readonly int SIZE_SCALE_POLICY = NDalicPINVOKE.Actor_Property_SIZE_SCALE_POLICY_get(); + internal static readonly int WIDTH_FOR_HEIGHT = NDalicPINVOKE.Actor_Property_WIDTH_FOR_HEIGHT_get(); + internal static readonly int HEIGHT_FOR_WIDTH = NDalicPINVOKE.Actor_Property_HEIGHT_FOR_WIDTH_get(); + internal static readonly int PADDING = NDalicPINVOKE.Actor_Property_PADDING_get(); + internal static readonly int MINIMUM_SIZE = NDalicPINVOKE.Actor_Property_MINIMUM_SIZE_get(); + internal static readonly int MAXIMUM_SIZE = NDalicPINVOKE.Actor_Property_MAXIMUM_SIZE_get(); + internal static readonly int INHERIT_POSITION = NDalicPINVOKE.Actor_Property_INHERIT_POSITION_get(); + internal static readonly int CLIPPING_MODE = NDalicPINVOKE.Actor_Property_CLIPPING_MODE_get(); + } + + public class Focus { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal KeyboardFocus(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(KeyboardFocus obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~KeyboardFocus() - { - Dispose(); - } - - public virtual void Dispose() - { - lock (this) - { - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_View_KeyboardFocus(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); - } - } - - public KeyboardFocus() : this(NDalicPINVOKE.new_View_KeyboardFocus(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public enum Direction { LEFT, @@ -1091,14 +1001,6 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public View Assign(View handle) - { - View ret = new View(NDalicPINVOKE.View_Assign(swigCPtr, View.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private new static View DownCast(BaseHandle handle) { View ret = new View(NDalicPINVOKE.View_DownCast(BaseHandle.getCPtr(handle)), true); @@ -1129,14 +1031,14 @@ namespace Dali return view; } - public void SetKeyInputFocus() + internal void SetFocus() { NDalicPINVOKE.View_SetKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool HasKeyInputFocus() + internal bool HasFocus() { bool ret = NDalicPINVOKE.View_HasKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1144,14 +1046,14 @@ namespace Dali return ret; } - public void ClearKeyInputFocus() + internal void ClearFocus() { NDalicPINVOKE.View_ClearKeyInputFocus(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PinchGestureDetector GetPinchGestureDetector() + internal PinchGestureDetector GetPinchGestureDetector() { PinchGestureDetector ret = new PinchGestureDetector(NDalicPINVOKE.View_GetPinchGestureDetector(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1159,7 +1061,7 @@ namespace Dali return ret; } - public PanGestureDetector GetPanGestureDetector() + internal PanGestureDetector GetPanGestureDetector() { PanGestureDetector ret = new PanGestureDetector(NDalicPINVOKE.View_GetPanGestureDetector(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1167,7 +1069,7 @@ namespace Dali return ret; } - public TapGestureDetector GetTapGestureDetector() + internal TapGestureDetector GetTapGestureDetector() { TapGestureDetector ret = new TapGestureDetector(NDalicPINVOKE.View_GetTapGestureDetector(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1175,7 +1077,7 @@ namespace Dali return ret; } - public LongPressGestureDetector GetLongPressGestureDetector() + internal LongPressGestureDetector GetLongPressGestureDetector() { LongPressGestureDetector ret = new LongPressGestureDetector(NDalicPINVOKE.View_GetLongPressGestureDetector(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1183,14 +1085,14 @@ namespace Dali return ret; } - public void SetStyleName(string styleName) + internal void SetStyleName(string styleName) { NDalicPINVOKE.View_SetStyleName(swigCPtr, styleName); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public string GetStyleName() + internal string GetStyleName() { string ret = NDalicPINVOKE.View_GetStyleName(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1198,28 +1100,6 @@ namespace Dali return ret; } - public void SetBackgroundColor(Vector4 color) - { - NDalicPINVOKE.View_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Vector4 GetBackgroundColor() - { - Vector4 ret = new Vector4(NDalicPINVOKE.View_GetBackgroundColor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetBackgroundImage(Image image) - { - NDalicPINVOKE.View_SetBackgroundImage(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void ClearBackground() { NDalicPINVOKE.View_ClearBackground(swigCPtr); @@ -1227,7 +1107,7 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ControlKeySignal KeyEventSignal() + internal ControlKeySignal KeyEventSignal() { ControlKeySignal ret = new ControlKeySignal(NDalicPINVOKE.View_KeyEventSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1235,7 +1115,7 @@ namespace Dali return ret; } - public KeyInputFocusSignal KeyInputFocusGainedSignal() + internal KeyInputFocusSignal KeyInputFocusGainedSignal() { KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.View_KeyInputFocusGainedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1243,7 +1123,7 @@ namespace Dali return ret; } - public KeyInputFocusSignal KeyInputFocusLostSignal() + internal KeyInputFocusSignal KeyInputFocusLostSignal() { KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.View_KeyInputFocusLostSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1251,7 +1131,7 @@ namespace Dali return ret; } - public View(ViewImpl implementation) : this(NDalicPINVOKE.new_View__SWIG_2(ViewImpl.getCPtr(implementation)), true) + internal View(ViewImpl implementation) : this(NDalicPINVOKE.new_View__SWIG_2(ViewImpl.getCPtr(implementation)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -1286,7 +1166,7 @@ namespace Dali Dali.Property.Map background = Background; int visualType = 0; - background.Find(Dali.Constants.Visual.Property.Type).Get(ref visualType); + background.Find(Dali.Constants.Visual.Property.Type).Get(out visualType); if (visualType == (int)Dali.Constants.Visual.Type.Color) { background.Find(Dali.Constants.ColorVisualProperty.MixColor).Get(backgroundColor); @@ -1308,7 +1188,7 @@ namespace Dali Dali.Property.Map background = Background; int visualType = 0; - background.Find(Dali.Constants.Visual.Property.Type).Get(ref visualType); + background.Find(Dali.Constants.Visual.Property.Type).Get(out visualType); if (visualType == (int)Dali.Constants.Visual.Type.Image) { background.Find(Dali.Constants.ImageVisualProperty.URL).Get(out backgroundImage); @@ -1322,12 +1202,12 @@ namespace Dali } } - public bool KeyInputFocus + public bool KeyFocusable { get { bool temp = false; - GetProperty(View.Property.KEY_INPUT_FOCUS).Get(ref temp); + GetProperty(View.Property.KEY_INPUT_FOCUS).Get(out temp); return temp; } set @@ -1405,7 +1285,7 @@ namespace Dali get { int temp = 0; - GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1419,7 +1299,7 @@ namespace Dali get { int temp = 0; - GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1433,7 +1313,7 @@ namespace Dali get { int temp = 0; - GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1447,7 +1327,7 @@ namespace Dali get { int temp = 0; - GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1461,7 +1341,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(FlexContainer.ChildProperty.FLEX).Get(ref temp); + GetProperty(FlexContainer.ChildProperty.FLEX).Get(out temp); return temp; } set @@ -1475,7 +1355,7 @@ namespace Dali get { int temp = 0; - GetProperty(FlexContainer.ChildProperty.ALIGN_SELF).Get(ref temp); + GetProperty(FlexContainer.ChildProperty.ALIGN_SELF).Get(out temp); return temp; } set @@ -1517,7 +1397,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(TableView.ChildProperty.ROW_SPAN).Get(ref temp); + GetProperty(TableView.ChildProperty.ROW_SPAN).Get(out temp); return temp; } set @@ -1531,7 +1411,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(TableView.ChildProperty.COLUMN_SPAN).Get(ref temp); + GetProperty(TableView.ChildProperty.COLUMN_SPAN).Get(out temp); return temp; } set @@ -1702,7 +1582,7 @@ namespace Dali { get { - return IsVisible(); + return Visible; } } @@ -1711,7 +1591,7 @@ namespace Dali get { float temp = 0; - GetProperty(View.Property.OPACITY).Get(ref temp); + GetProperty(View.Property.OPACITY).Get(out temp); return temp; } set @@ -1744,12 +1624,12 @@ namespace Dali } } - protected bool PositionUsesAnchorPoint + internal bool PositionUsesAnchorPoint { get { bool temp = false; - GetProperty(View.Property.POSITION_USES_ANCHOR_POINT).Get(ref temp); + GetProperty(View.Property.POSITION_USES_ANCHOR_POINT).Get(out temp); return temp; } set @@ -1758,15 +1638,15 @@ namespace Dali } } - public bool StateFocusEnable + internal bool FocusState { get { - return IsKeyboardFocusable(); + return IsFocusable(); } set { - SetKeyboardFocusable(value); + SetFocusable(value); } } @@ -1783,7 +1663,7 @@ namespace Dali get { int temp = 0; - GetProperty(View.Property.SIBLING_ORDER).Get(ref temp); + GetProperty(View.Property.SIBLING_ORDER).Get(out temp); return temp; } set @@ -1794,12 +1674,12 @@ namespace Dali public void Show() { - SetVisible(true); + Visible = true; } public void Hide() { - SetVisible(false); + Visible = false; } public void Raise() @@ -1844,22 +1724,7 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public string GetName() - { - string ret = NDalicPINVOKE.Actor_GetName(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetName(string name) - { - NDalicPINVOKE.Actor_SetName(swigCPtr, name); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public uint GetId() + private uint GetId() { uint ret = NDalicPINVOKE.Actor_GetId(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1867,7 +1732,7 @@ namespace Dali return ret; } - public bool OnWindow() + private bool OnWindow() { bool ret = NDalicPINVOKE.Actor_OnStage(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1936,7 +1801,7 @@ namespace Dali return ret; } - public View GetParent() + private View GetParent() { View ret = new View(NDalicPINVOKE.Actor_GetParent(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1944,14 +1809,14 @@ namespace Dali return ret; } - public void SetParentOrigin(Vector3 origin) + private void SetParentOrigin(Vector3 origin) { NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Vector3 GetCurrentParentOrigin() + private Vector3 GetCurrentParentOrigin() { Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentParentOrigin(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -1959,14 +1824,14 @@ namespace Dali return ret; } - public void SetAnchorPoint(Vector3 anchorPoint) + private void SetAnchorPoint(Vector3 anchorPoint) { NDalicPINVOKE.Actor_SetAnchorPoint(swigCPtr, Vector3.getCPtr(anchorPoint)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Vector3 GetCurrentAnchorPoint() + private Vector3 GetCurrentAnchorPoint() { Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentAnchorPoint(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2010,7 +1875,7 @@ namespace Dali return ret; } - public Vector3 GetCurrentSize() + private Vector3 GetCurrentSize() { Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentSize(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2018,7 +1883,7 @@ namespace Dali return ret; } - public Vector3 GetNaturalSize() + internal Vector3 GetNaturalSize() { Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetNaturalSize(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2026,48 +1891,6 @@ namespace Dali return ret; } - public void SetPosition(float x, float y) - { - NDalicPINVOKE.Actor_SetPosition__SWIG_0(swigCPtr, x, y); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetPosition(float x, float y, float z) - { - NDalicPINVOKE.Actor_SetPosition__SWIG_1(swigCPtr, x, y, z); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetPosition(Vector3 position) - { - NDalicPINVOKE.Actor_SetPosition__SWIG_2(swigCPtr, Vector3.getCPtr(position)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetX(float x) - { - NDalicPINVOKE.Actor_SetX(swigCPtr, x); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetY(float y) - { - NDalicPINVOKE.Actor_SetY(swigCPtr, y); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetZ(float z) - { - NDalicPINVOKE.Actor_SetZ(swigCPtr, z); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void TranslateBy(Vector3 distance) { NDalicPINVOKE.Actor_TranslateBy(swigCPtr, Vector3.getCPtr(distance)); @@ -2075,7 +1898,7 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Vector3 GetCurrentPosition() + private Vector3 GetCurrentPosition() { Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentPosition(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2083,58 +1906,6 @@ namespace Dali return ret; } - public Vector3 GetCurrentWorldPosition() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldPosition(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetInheritPosition(bool inherit) - { - NDalicPINVOKE.Actor_SetInheritPosition(swigCPtr, inherit); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PositionInheritanceMode GetPositionInheritanceMode() - { - PositionInheritanceMode ret = (PositionInheritanceMode)NDalicPINVOKE.Actor_GetPositionInheritanceMode(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public bool IsPositionInherited() - { - bool ret = NDalicPINVOKE.Actor_IsPositionInherited(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetOrientation(Degree angle, Vector3 axis) - { - NDalicPINVOKE.Actor_SetOrientation__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetOrientation(Radian angle, Vector3 axis) - { - NDalicPINVOKE.Actor_SetOrientation__SWIG_1(swigCPtr, Radian.getCPtr(angle), Vector3.getCPtr(axis)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetOrientation(Rotation orientation) - { - NDalicPINVOKE.Actor_SetOrientation__SWIG_2(swigCPtr, Rotation.getCPtr(orientation)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void RotateBy(Degree angle, Vector3 axis) { NDalicPINVOKE.Actor_RotateBy__SWIG_0(swigCPtr, Degree.getCPtr(angle), Vector3.getCPtr(axis)); @@ -2156,58 +1927,6 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Rotation GetCurrentOrientation() - { - Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentOrientation(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetInheritOrientation(bool inherit) - { - NDalicPINVOKE.Actor_SetInheritOrientation(swigCPtr, inherit); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool IsOrientationInherited() - { - bool ret = NDalicPINVOKE.Actor_IsOrientationInherited(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Rotation GetCurrentWorldOrientation() - { - Rotation ret = new Rotation(NDalicPINVOKE.Actor_GetCurrentWorldOrientation(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetScale(float scale) - { - NDalicPINVOKE.Actor_SetScale__SWIG_0(swigCPtr, scale); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetScale(float scaleX, float scaleY, float scaleZ) - { - NDalicPINVOKE.Actor_SetScale__SWIG_1(swigCPtr, scaleX, scaleY, scaleZ); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public void SetScale(Vector3 scale) - { - NDalicPINVOKE.Actor_SetScale__SWIG_2(swigCPtr, Vector3.getCPtr(scale)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void ScaleBy(Vector3 relativeScale) { NDalicPINVOKE.Actor_ScaleBy(swigCPtr, Vector3.getCPtr(relativeScale)); @@ -2215,105 +1934,6 @@ namespace Dali throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Vector3 GetCurrentScale() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentScale(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Vector3 GetCurrentWorldScale() - { - Vector3 ret = new Vector3(NDalicPINVOKE.Actor_GetCurrentWorldScale(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetInheritScale(bool inherit) - { - NDalicPINVOKE.Actor_SetInheritScale(swigCPtr, inherit); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool IsScaleInherited() - { - bool ret = NDalicPINVOKE.Actor_IsScaleInherited(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public Matrix GetCurrentWorldMatrix() - { - Matrix ret = new Matrix(NDalicPINVOKE.Actor_GetCurrentWorldMatrix(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetVisible(bool visible) - { - NDalicPINVOKE.Actor_SetVisible(swigCPtr, visible); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool IsVisible() - { - bool ret = NDalicPINVOKE.Actor_IsVisible(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetOpacity(float opacity) - { - NDalicPINVOKE.Actor_SetOpacity(swigCPtr, opacity); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public float GetCurrentOpacity() - { - float ret = NDalicPINVOKE.Actor_GetCurrentOpacity(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetColor(Vector4 color) - { - NDalicPINVOKE.Actor_SetColor(swigCPtr, Vector4.getCPtr(color)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Vector4 GetCurrentColor() - { - Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentColor(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetColorMode(ColorMode colorMode) - { - NDalicPINVOKE.Actor_SetColorMode(swigCPtr, (int)colorMode); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ColorMode GetColorMode() - { - ColorMode ret = (ColorMode)NDalicPINVOKE.Actor_GetColorMode(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public Vector4 GetCurrentWorldColor() { Vector4 ret = new Vector4(NDalicPINVOKE.Actor_GetCurrentWorldColor(swigCPtr), true); @@ -2337,21 +1957,6 @@ namespace Dali return ret; } - public void SetSensitive(bool sensitive) - { - NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool IsSensitive() - { - bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public bool ScreenToLocal(out float localX, out float localY, float screenX, float screenY) { bool ret = NDalicPINVOKE.Actor_ScreenToLocal(swigCPtr, out localX, out localY, screenX, screenY); @@ -2360,29 +1965,14 @@ namespace Dali return ret; } - public void SetLeaveRequired(bool required) - { - NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public bool GetLeaveRequired() - { - bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public void SetKeyboardFocusable(bool focusable) + public void SetFocusable(bool focusable) { NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool IsKeyboardFocusable() + public bool IsFocusable() { bool ret = NDalicPINVOKE.Actor_IsKeyboardFocusable(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2405,21 +1995,6 @@ namespace Dali return ret; } - public void SetSizeScalePolicy(SizeScalePolicyType policy) - { - NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public SizeScalePolicyType GetSizeScalePolicy() - { - SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void SetSizeModeFactor(Vector3 factor) { NDalicPINVOKE.Actor_SetSizeModeFactor(swigCPtr, Vector3.getCPtr(factor)); @@ -2511,7 +2086,7 @@ namespace Dali return ret; } - public uint AddRenderer(Renderer renderer) + internal uint AddRenderer(Renderer renderer) { uint ret = NDalicPINVOKE.Actor_AddRenderer(swigCPtr, Renderer.getCPtr(renderer)); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2519,7 +2094,7 @@ namespace Dali return ret; } - public uint GetRendererCount() + internal uint GetRendererCount() { uint ret = NDalicPINVOKE.Actor_GetRendererCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2527,7 +2102,7 @@ namespace Dali return ret; } - public Renderer GetRendererAt(uint index) + internal Renderer GetRendererAt(uint index) { Renderer ret = new Renderer(NDalicPINVOKE.Actor_GetRendererAt(swigCPtr, index), true); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2535,14 +2110,14 @@ namespace Dali return ret; } - public void RemoveRenderer(Renderer renderer) + internal void RemoveRenderer(Renderer renderer) { NDalicPINVOKE.Actor_RemoveRenderer__SWIG_0(swigCPtr, Renderer.getCPtr(renderer)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveRenderer(uint index) + internal void RemoveRenderer(uint index) { NDalicPINVOKE.Actor_RemoveRenderer__SWIG_1(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2573,7 +2148,7 @@ namespace Dali return ret; } - public ViewSignal OnWindowSignal() + internal ViewSignal OnWindowSignal() { ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OnStageSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2581,7 +2156,7 @@ namespace Dali return ret; } - public ViewSignal OffStageSignal() + internal ViewSignal OffStageSignal() { ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OffStageSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2589,7 +2164,7 @@ namespace Dali return ret; } - public ViewSignal OnRelayoutSignal() + internal ViewSignal OnRelayoutSignal() { ViewSignal ret = new ViewSignal(NDalicPINVOKE.Actor_OnRelayoutSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) @@ -2616,7 +2191,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.PARENT_ORIGIN_X).Get(ref temp); + GetProperty(View.Property.PARENT_ORIGIN_X).Get(out temp); return temp; } set @@ -2630,7 +2205,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.PARENT_ORIGIN_Y).Get(ref temp); + GetProperty(View.Property.PARENT_ORIGIN_Y).Get(out temp); return temp; } set @@ -2644,7 +2219,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.PARENT_ORIGIN_Z).Get(ref temp); + GetProperty(View.Property.PARENT_ORIGIN_Z).Get(out temp); return temp; } set @@ -2653,7 +2228,7 @@ namespace Dali } } - public Vector3 AnchorPoint + public Vector3 PivotPoint { get { @@ -2667,12 +2242,12 @@ namespace Dali } } - public float AnchorPointX + public float PivotPointX { get { float temp = 0.0f; - GetProperty(View.Property.ANCHOR_POINT_X).Get(ref temp); + GetProperty(View.Property.ANCHOR_POINT_X).Get(out temp); return temp; } set @@ -2681,12 +2256,12 @@ namespace Dali } } - public float AnchorPointY + public float PivotPointY { get { float temp = 0.0f; - GetProperty(View.Property.ANCHOR_POINT_Y).Get(ref temp); + GetProperty(View.Property.ANCHOR_POINT_Y).Get(out temp); return temp; } set @@ -2695,12 +2270,12 @@ namespace Dali } } - public float AnchorPointZ + public float PivotPointZ { get { float temp = 0.0f; - GetProperty(View.Property.ANCHOR_POINT_Z).Get(ref temp); + GetProperty(View.Property.ANCHOR_POINT_Z).Get(out temp); return temp; } set @@ -2728,7 +2303,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.SIZE_WIDTH).Get(ref temp); + GetProperty(View.Property.SIZE_WIDTH).Get(out temp); return temp; } set @@ -2742,7 +2317,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.SIZE_HEIGHT).Get(ref temp); + GetProperty(View.Property.SIZE_HEIGHT).Get(out temp); return temp; } set @@ -2751,20 +2326,6 @@ namespace Dali } } - public float SizeDepth - { - get - { - float temp = 0.0f; - GetProperty(View.Property.SIZE_DEPTH).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.SIZE_DEPTH, new Dali.Property.Value(value)); - } - } - public Vector3 Position { get @@ -2784,7 +2345,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.POSITION_X).Get(ref temp); + GetProperty(View.Property.POSITION_X).Get(out temp); return temp; } set @@ -2798,7 +2359,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.POSITION_Y).Get(ref temp); + GetProperty(View.Property.POSITION_Y).Get(out temp); return temp; } set @@ -2812,7 +2373,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.POSITION_Z).Get(ref temp); + GetProperty(View.Property.POSITION_Z).Get(out temp); return temp; } set @@ -2836,7 +2397,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.WORLD_POSITION_X).Get(ref temp); + GetProperty(View.Property.WORLD_POSITION_X).Get(out temp); return temp; } } @@ -2846,7 +2407,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.WORLD_POSITION_Y).Get(ref temp); + GetProperty(View.Property.WORLD_POSITION_Y).Get(out temp); return temp; } } @@ -2856,7 +2417,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.WORLD_POSITION_Z).Get(ref temp); + GetProperty(View.Property.WORLD_POSITION_Z).Get(out temp); return temp; } } @@ -2904,7 +2465,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.SCALE_X).Get(ref temp); + GetProperty(View.Property.SCALE_X).Get(out temp); return temp; } set @@ -2918,7 +2479,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.SCALE_Y).Get(ref temp); + GetProperty(View.Property.SCALE_Y).Get(out temp); return temp; } set @@ -2932,7 +2493,7 @@ namespace Dali get { float temp = 0.0f; - GetProperty(View.Property.SCALE_Z).Get(ref temp); + GetProperty(View.Property.SCALE_Z).Get(out temp); return temp; } set @@ -2956,7 +2517,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.VISIBLE).Get(ref temp); + GetProperty(View.Property.VISIBLE).Get(out temp); return temp; } set @@ -2965,62 +2526,6 @@ namespace Dali } } - public float ColorRed - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_RED).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_RED, new Dali.Property.Value(value)); - } - } - - public float ColorGreen - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_GREEN).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_GREEN, new Dali.Property.Value(value)); - } - } - - public float ColorBlue - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_BLUE).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_BLUE, new Dali.Property.Value(value)); - } - } - - public float ColorAlpha - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_ALPHA).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_ALPHA, new Dali.Property.Value(value)); - } - } - public Vector4 WorldColor { get @@ -3060,7 +2565,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.SENSITIVE).Get(ref temp); + GetProperty(View.Property.SENSITIVE).Get(out temp); return temp; } set @@ -3074,7 +2579,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.LEAVE_REQUIRED).Get(ref temp); + GetProperty(View.Property.LEAVE_REQUIRED).Get(out temp); return temp; } set @@ -3088,7 +2593,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.INHERIT_ORIENTATION).Get(ref temp); + GetProperty(View.Property.INHERIT_ORIENTATION).Get(out temp); return temp; } set @@ -3102,7 +2607,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.INHERIT_SCALE).Get(ref temp); + GetProperty(View.Property.INHERIT_SCALE).Get(out temp); return temp; } set @@ -3111,34 +2616,6 @@ namespace Dali } } - public string ColorMode - { - get - { - string temp; - GetProperty(View.Property.COLOR_MODE).Get(out temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_MODE, new Dali.Property.Value(value)); - } - } - - public string PositionInheritance - { - get - { - string temp; - GetProperty(View.Property.POSITION_INHERITANCE).Get(out temp); - return temp; - } - set - { - SetProperty(View.Property.POSITION_INHERITANCE, new Dali.Property.Value(value)); - } - } - public string DrawMode { get @@ -3149,7 +2626,7 @@ namespace Dali } set { - SetProperty(View.Property.DRAW_MODE, new Dali.Property.Value(value)); + SetProperty(View.Property.DRAW_MODE, new Dali.Property.Value(value)); } } @@ -3214,7 +2691,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.WIDTH_FOR_HEIGHT).Get(ref temp); + GetProperty(View.Property.WIDTH_FOR_HEIGHT).Get(out temp); return temp; } set @@ -3228,7 +2705,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.HEIGHT_FOR_WIDTH).Get(ref temp); + GetProperty(View.Property.HEIGHT_FOR_WIDTH).Get(out temp); return temp; } set @@ -3284,7 +2761,7 @@ namespace Dali get { bool temp = false; - GetProperty(View.Property.INHERIT_POSITION).Get(ref temp); + GetProperty(View.Property.INHERIT_POSITION).Get(out temp); return temp; } set diff --git a/plugins/dali-sharp/sharp/internal/ViewWrapper.cs b/plugins/dali-sharp/sharp/public/ViewWrapper.cs similarity index 81% rename from plugins/dali-sharp/sharp/internal/ViewWrapper.cs rename to plugins/dali-sharp/sharp/public/ViewWrapper.cs index 80596a0..779a847 100755 --- a/plugins/dali-sharp/sharp/internal/ViewWrapper.cs +++ b/plugins/dali-sharp/sharp/public/ViewWrapper.cs @@ -19,7 +19,7 @@ namespace Dali public class ViewWrapper : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected ViewWrapperImpl viewWrapperImpl; + internal ViewWrapperImpl viewWrapperImpl; internal ViewWrapper(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapper_SWIGUpcast(cPtr), cMemoryOwn) { @@ -61,7 +61,7 @@ namespace Dali } - public ViewWrapper(string typeName, ViewWrapperImpl implementation) : this(NDalicManualPINVOKE.ViewWrapper_New(typeName, ViewWrapperImpl.getCPtr(implementation)), true) + internal ViewWrapper(string typeName, ViewWrapperImpl implementation) : this(NDalicManualPINVOKE.ViewWrapper_New(typeName, ViewWrapperImpl.getCPtr(implementation)), true) { viewWrapperImpl = implementation; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -72,14 +72,7 @@ namespace Dali if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ViewWrapper Assign(ViewWrapper handle) - { - ViewWrapper ret = new ViewWrapper(NDalicManualPINVOKE.ViewWrapper_Assign(swigCPtr, ViewWrapper.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ViewWrapper DownCast(BaseHandle handle) + internal new static ViewWrapper DownCast(BaseHandle handle) { ViewWrapper ret = new ViewWrapper(NDalicManualPINVOKE.ViewWrapper_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/plugins/dali-sharp/sharp/internal/VisualBase.cs b/plugins/dali-sharp/sharp/public/VisualBase.cs similarity index 89% rename from plugins/dali-sharp/sharp/internal/VisualBase.cs rename to plugins/dali-sharp/sharp/public/VisualBase.cs index e27a61d..c5b568c 100644 --- a/plugins/dali-sharp/sharp/internal/VisualBase.cs +++ b/plugins/dali-sharp/sharp/public/VisualBase.cs @@ -53,12 +53,6 @@ public class VisualBase : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public VisualBase Assign(VisualBase handle) { - VisualBase ret = new VisualBase(NDalicPINVOKE.VisualBase_Assign(swigCPtr, VisualBase.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void SetName(string name) { NDalicPINVOKE.VisualBase_SetName(swigCPtr, name); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -108,7 +102,7 @@ public class VisualBase : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public VisualBase(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base impl) : this(NDalicPINVOKE.new_VisualBase__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.getCPtr(impl)), true) { + internal VisualBase(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base impl) : this(NDalicPINVOKE.new_VisualBase__SWIG_2(SWIGTYPE_p_Dali__Toolkit__Internal__Visual__Base.getCPtr(impl)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/plugins/dali-sharp/sharp/internal/VisualFactory.cs b/plugins/dali-sharp/sharp/public/VisualFactory.cs similarity index 90% rename from plugins/dali-sharp/sharp/internal/VisualFactory.cs rename to plugins/dali-sharp/sharp/public/VisualFactory.cs index 1a91463..fa21429 100644 --- a/plugins/dali-sharp/sharp/internal/VisualFactory.cs +++ b/plugins/dali-sharp/sharp/public/VisualFactory.cs @@ -77,12 +77,6 @@ public class VisualFactory : BaseHandle { return ret; } - public VisualBase CreateVisual(string url, Uint16Pair size) { - VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } } diff --git a/plugins/dali-sharp/sharp/internal/Wheel.cs b/plugins/dali-sharp/sharp/public/Wheel.cs similarity index 100% rename from plugins/dali-sharp/sharp/internal/Wheel.cs rename to plugins/dali-sharp/sharp/public/Wheel.cs diff --git a/plugins/dali-sharp/sharp/internal/Window.cs b/plugins/dali-sharp/sharp/public/Window.cs similarity index 92% rename from plugins/dali-sharp/sharp/internal/Window.cs rename to plugins/dali-sharp/sharp/public/Window.cs index 196cd47..78b705e 100644 --- a/plugins/dali-sharp/sharp/internal/Window.cs +++ b/plugins/dali-sharp/sharp/public/Window.cs @@ -72,13 +72,13 @@ public class Window : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetAcceptFocus( bool accept ) + internal void SetAcceptFocus( bool accept ) { NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public bool IsFocusAcceptable() + internal bool IsFocusAcceptable() { return NDalicPINVOKE.IsFocusAcceptable(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -151,7 +151,7 @@ public class Window : BaseHandle { } } - public WindowFocusSignalType WindowFocusChangedSignal() { + internal WindowFocusSignalType WindowFocusChangedSignal() { WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -166,14 +166,7 @@ public class Window : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Window (Rectangle windowPosition, string name, string className, bool isTransparent) : this (NDalicPINVOKE.Window_New__SWIG_2(Rectangle.getCPtr(windowPosition), name, className, isTransparent), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public Window (Rectangle windowPosition, string name, string className) : this (NDalicPINVOKE.Window_New__SWIG_3(Rectangle.getCPtr(windowPosition), name, className), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - - } public Window(Window handle) : this(NDalicPINVOKE.new_Window__SWIG_1(Window.getCPtr(handle)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -189,7 +182,7 @@ public class Window : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity) { + public void SetIndicatorBackgroundOpacity(Window.IndicatorBackgroundOpacity opacity) { NDalicPINVOKE.Window_SetIndicatorBgOpacity(swigCPtr, (int)opacity); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -219,40 +212,40 @@ public class Window : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void AddAvailableOrientation(Window.WindowOrientation orientation) { + internal void AddAvailableOrientation(Window.WindowOrientation orientation) { NDalicPINVOKE.Window_AddAvailableOrientation(swigCPtr, (int)orientation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveAvailableOrientation(Window.WindowOrientation orientation) { + internal void RemoveAvailableOrientation(Window.WindowOrientation orientation) { NDalicPINVOKE.Window_RemoveAvailableOrientation(swigCPtr, (int)orientation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetPreferredOrientation(Window.WindowOrientation orientation) { + internal void SetPreferredOrientation(Window.WindowOrientation orientation) { NDalicPINVOKE.Window_SetPreferredOrientation(swigCPtr, (int)orientation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Window.WindowOrientation GetPreferredOrientation() { + internal Window.WindowOrientation GetPreferredOrientation() { Window.WindowOrientation ret = (Window.WindowOrientation)NDalicPINVOKE.Window_GetPreferredOrientation(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public DragAndDropDetector GetDragAndDropDetector() { + internal DragAndDropDetector GetDragAndDropDetector() { DragAndDropDetector ret = new DragAndDropDetector(NDalicPINVOKE.Window_GetDragAndDropDetector(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public Any GetNativeHandle() { + internal Any GetNativeHandle() { Any ret = new Any(NDalicPINVOKE.Window_GetNativeHandle(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public WindowFocusSignalType FocusChangedSignal() { + internal WindowFocusSignalType FocusChangedSignal() { WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -291,7 +284,7 @@ public class Window : BaseHandle { return ret; } - public RenderTaskList GetRenderTaskList() { + internal RenderTaskList GetRenderTaskList() { RenderTaskList ret = new RenderTaskList(NDalicPINVOKE.Stage_GetRenderTaskList(stageCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -332,7 +325,7 @@ public class Window : BaseHandle { return ret; } - public ObjectRegistry GetObjectRegistry() { + internal ObjectRegistry GetObjectRegistry() { ObjectRegistry ret = new ObjectRegistry(NDalicPINVOKE.Stage_GetObjectRegistry(stageCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -343,49 +336,49 @@ public class Window : BaseHandle { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public KeyEventSignal KeyEventSignal() { + internal KeyEventSignal KeyEventSignal() { KeyEventSignal ret = new KeyEventSignal(NDalicPINVOKE.Stage_KeyEventSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal EventProcessingFinishedSignal() { + internal VoidSignal EventProcessingFinishedSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_EventProcessingFinishedSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public TouchSignal TouchSignal() { + internal TouchSignal TouchSignal() { TouchSignal ret = new TouchSignal(NDalicPINVOKE.Stage_TouchSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - private StageWheelSignal WheelEventSignal() { + internal StageWheelSignal WheelEventSignal() { StageWheelSignal ret = new StageWheelSignal(NDalicPINVOKE.Stage_WheelEventSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal ContextLostSignal() { + internal VoidSignal ContextLostSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextLostSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal ContextRegainedSignal() { + internal VoidSignal ContextRegainedSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_ContextRegainedSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public VoidSignal SceneCreatedSignal() { + internal VoidSignal SceneCreatedSignal() { VoidSignal ret = new VoidSignal(NDalicPINVOKE.Stage_SceneCreatedSignal(stageCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static Vector4 DEFAULT_BACKGROUND_COLOR { + internal static Vector4 DEFAULT_BACKGROUND_COLOR { get { global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEFAULT_BACKGROUND_COLOR_get(); Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); @@ -394,7 +387,7 @@ public class Window : BaseHandle { } } - public static Vector4 DEBUG_BACKGROUND_COLOR { + internal static Vector4 DEBUG_BACKGROUND_COLOR { get { global::System.IntPtr cPtr = NDalicPINVOKE.Stage_DEBUG_BACKGROUND_COLOR_get(); Vector4 ret = (cPtr == global::System.IntPtr.Zero) ? null : new Vector4(cPtr, false); @@ -419,7 +412,7 @@ public class Window : BaseHandle { LANDSCAPE_INVERSE = 270 } - public enum IndicatorBgOpacity { + public enum IndicatorBackgroundOpacity { OPAQUE = 100, TRANSLUCENT = 50, TRANSPARENT = 0 @@ -467,7 +460,7 @@ public class Window : BaseHandle { * (i.e. the down & up touch events only). * */ - public event EventHandler Touch + public event EventHandler Touched { add { @@ -539,7 +532,7 @@ public class Window : BaseHandle { * Wheel signal is emitted is emitted when wheel event is received. * */ - public event EventHandler Wheel + public event EventHandler WheelRolled { add { @@ -661,7 +654,7 @@ public class Window : BaseHandle { * provided by the user. EventProcessingFinished signal is emitted just after the event processing is finished. * */ - public event EventHandler EventProcessingFinished + internal event EventHandler EventProcessingFinished { add { @@ -703,7 +696,7 @@ public class Window : BaseHandle { * ContextLost signal is emitted when the GL context is lost (Platform specific behaviour). * */ - public event EventHandler ContextLost + internal event EventHandler ContextLost { add { @@ -747,7 +740,7 @@ public class Window : BaseHandle { * behaviour). * */ - public event EventHandler ContextRegained + internal event EventHandler ContextRegained { add { @@ -790,7 +783,7 @@ public class Window : BaseHandle { * SceneCreated signal is emitted after the initial scene is created. * */ - public event EventHandler SceneCreated + internal event EventHandler SceneCreated { add { diff --git a/plugins/dali-sharp/test/test.cs b/plugins/dali-sharp/test/test.cs index fbbccbc..e5866ab 100644 --- a/plugins/dali-sharp/test/test.cs +++ b/plugins/dali-sharp/test/test.cs @@ -115,7 +115,7 @@ namespace Test buttonWithSimpleTooltip.Position = new Position(windowSize.Width /2 , 0, 0); Window.Instance.Add(buttonWithSimpleTooltip); - buttonWithSimpleTooltip.SetKeyboardFocusable(true); + buttonWithSimpleTooltip.SetFocusable(true); buttonWithSimpleTooltip.TooltipText = "RePosition Square and change color to Blue"; buttonWithSimpleTooltip.Clicked += (obj, ee) => {