From: dongsug-song <35130733+dongsug-song@users.noreply.github.com> Date: Fri, 6 Sep 2019 12:54:57 +0000 (+0900) Subject: [NUI] Integration from dalihub (DALi 1.4.34) (#999) X-Git-Tag: submit/tizen/20190907.005204~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ba7d16f8a9a032cbaab592204a019fed2062d6b;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Integration from dalihub (DALi 1.4.34) (#999) * Added LayoutGroup and LayoutItem classes in NUI. This was done by using bindings wrapper classes for LayoutItem, LayoutGroup, LayoutMeasureSpec, LayoutLength, and LayoutMeasuredSize. Change-Id: I19e28bdff59a62cf1c8e8711f50f9f0e8f1c119a * Layouting support in NUI Change-Id: I3d6f688d869faa81c34385db37feceb1d8c1d0c0 * Fixed disposed bug and removed RegisterChildProperties API usage. Change-Id: I7b71bd1a3a03306897abdf3c263c6bbb65c1bff8 * RootLayout added to Window Change-Id: Ie47ceec452b5f254950263bdaf661e9e3fe86d1f * All Layers have an Absolute layout Change-Id: I08281a25b2b73822b45f5c6a567b574b5af74fb4 * Set View.Size2D sets layout minimum size if exists. Change-Id: Ide73c78957d9ee5d4799bfff4aa2232b87ffa536 * [NUI] Minimize public api for xaml Change-Id: Ib1426b1956a2af307bd6128d6b97067b0d732847 * Renaming of rootlayer in Layer.cs Change-Id: I583f49caaad819cabaca83b09c9c7dd9c2b9a331 * Fix NUI nested layout issue Change-Id: I68edd6cf8295e06a52655d84b8ce039a4e1f1008 * [NUI] Back-sync Samsung/TizenFX into dalihub/TizenFX Change-Id: Ib63e792bc3474c9226506f30889994219e237ec1 * [NUI] Remove tabs and redundant spaces Change-Id: I1d512d7f478e532f76629b2529995386820fc764 * Sync dalihub/TizenFX and Samsung/TizenFX - [NUI] Remove apis which are using internal APIs (#324) Some apis are using DALi internal APIs. Clean up these wrong apis to prevent future errors. Signed-off-by: minho.sun Change-Id: I77f773ec84f93f69684c2bdad26d9721f8ed705d Signed-off-by: dongsug.song * Sync dalihub/TizenFX and Samsung/TizenFX for NUI-XAML related changes Change-Id: Ied6a4e33d462712672e65763572c6aa88065a897 Signed-off-by: dongsug.song * Support multi-cascade property setting for Size2D and Position2D Change-Id: Ibeb9e9ec639742b78054fe8592167170ea0f00d2 Signed-off-by: dongsug.song * Add Mouse button type to identify clicked button kind Change-Id: Id336dacccff8192a17cda552ba8ea2ba01121002 Signed-off-by: dongsug.song * [NUI] Fix dereferenced error Value trans, which has null value, is dereferenced in member access expression trans.Name Change-Id: I5b7fa2a0e96689ff0cc0821f2e931ed3c4001e9d Signed-off-by: huiyu.eun * [NUI]Remove ContentProperty attribute and update sample Change-Id: I0fbb60bf00c609779b6f5ff4d8aff58a26a8819e * [NUI] Fix children count of LayoutGroup bug Change-Id: I73c3b597b161a2dbf4a52d37e6f5a0ab4858c11b Signed-off-by: huiyu.eun * [NUI] Make Layout APIs as internal ones (will be changed as public APIs later) Conflicts: src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs Change-Id: Ia64e9216d10ecc986e0e977f2e0633a03813faec Signed-off-by: dongsug.song * Fix View Size2D. We force Size2D by setting fixed width & height specifications. There is no really another way in new layouting without breaking new layouting design. Also MinimumSize will set now Layout.MinimumSize. Change-Id: I65c7eaab8210c83b9097426a14c8877173d11f90 * [NUI] Change Parameter type of KeyboardRepeatInfo APIs - Changed the parameters type of KeyboardRepeatInfo APIs : 'double' type -> 'float' type Change-Id: I3940e44a1a2c116988e8c947ae81d118ac266000 Signed-off-by: Seoyeon Kim * [NUI] Fix getting ClippingMode error Change-Id: I2379ec6adda1442e819d2adbaa9751e5dd154996 * [NUI] Fix animation flickering issue. Change-Id: Idd3e28ac861a6fa33ad316e4bcae6a7b2199c0de Signed-off-by: Feng Jin * [NUI] Remove redundant logs Change-Id: Ic7ec157fe8117b613d0d008f68e74cf7c4bccf64 * [NUI] Fix KeyValue issue Change-Id: I1970a61633fba277379a43035cf84ec2871d1cdd * [NUI]public BindableObject.GetValue and BindableObject.SetValue to enable other modules(EX.Tizen.TV.NUI) to implement data binding. Change-Id: Ibb048e668e765a96f1e8553951e4073b181e9a84 Signed-off-by: Feng Jin * [NUI]Add protect codes in API View::Add 1. Add protect codes, so that if the child is null, this API won't don anything. Change-Id: Icfd7e2cbb08b99ed962660edb88e8797bad2b654 * [NUI] public gesture detector. Change-Id: Ife9902fe77b43f2c422a1a2ebeaf474d13e67589 Signed-off-by: Feng Jin * GridLayout added Change-Id: I67916a0e2a8efde6fd8d28daac79bca39d679d10 * Add PropertyValue.Get function for RelativeVector2, RelativeVector3, and RelativeVector4 type. Change-Id: I181c51a6eea0a94721b28a48d8187673a3f0b88b Signed-off-by: Feng Jin * Explict assigning of Layouts to children Allows legacy GridContainer to display it's children. CustomLayouts children get a LayoutItem and displayed. Change-Id: Ic3f900ae01800de77695b85a57661f886ee060b7 * [NUI] Add DestroyContext call before disposing TextField/TextEditor In order to speed up IME hide, temporarily add DestroyContext call. Change-Id: Id93c99f4d45061d4e406d36ced7a0ec09c8f2c34 * [NUI] VisualMap revising Here are some changes: Add VisualFittingMode property Add Atlasing property Add Shadow,Underline,Outline,Background property Add RenderIfTransparent property Change-Id: I8d85f9d1a438cb6fbb636f79c7438e9134e1df8f * [NUI] Add visual test example Change-Id: I25f41d969f7b98a494a4fa1716b0335c09ab5026 * [NUI] Add friend assembly for Tizen.TV.NUI.Component Change-Id: I2fdc02205c03aa98260035fb81998d68514c030e * View.cs assignement error and logging fix Change-Id: Ic43213bb7e565f03f83d27df153d095b0e9f7143 * [NUI] Add support for changing the Rendering behavior Change-Id: Ibbe3627659132fd40105482761795f62a92d1856 * Size2D set updates measure spec for all Views Previously Size2D set only updated the WIDTH/HEIGHT MEASURESPEC for Views that already had a Layout set. But if the Size2D was set before the View added to it's parent then the set size would not update the measure specs. Change-Id: I28e731e5e6c6318231b5ba25108bf2daa9cd3411 * [NUI] Avoid raising InputMethodContext reference count Change-Id: I25e89f41daa41008c81ae1b46fbb82c75a98a011 * [NUI] Add getter property for VisualFittingMode Change-Id: I1ee389dd4a84f153e4a5d063fe3331a9525757eb * [NUI] VisualMaps revising continue Here are changes: 1. Update VisualFittingMode 2. Remove EditorBrowsable attribute Change-Id: I2f272e822ba227fe255031b3574db325505e90e1 * [NUI] Add LinearLayout Alignment and Weight Change-Id: I0ed3010fd27f8f4cb26126efc5547a301c69cf38 Signed-off-by: Seoyeon Kim * SetLayoutRequired, IsLayoutRequired View API added Change-Id: I6b4351901ad841c04f92b22be62c43f7f20b9263 * Fixes required after https://review.tizen.org/gerrit/#/c/189231/ Removal of dangerous float conversion Change-Id: I6766c8747865c229a1df3ed669a1d9ab90fefdc4 * Update LayoutItem doxygen for Minimum(Width|Height) API. Change-Id: I0ead74f919c73823cb6f4b241bea81cbcdde4c98 * [NUI] Fix LayoutItemWrapperImpl null issue Change-Id: I158533d132eb81c4681d8ff622124ba45bfe0e4b Signed-off-by: huiyu.eun * [NUI] Fix RenderingBehavior issue Change-Id: I35b83e115fd60d2b43ed49c2a35a0f34377e55c2 Signed-off-by: huiyu.eun * [NUI] Support Resource path when using xaml Change-Id: I066c4a6b051bfdcc5fa6b26f9f784a2be5a255a7 * [NUI] Public ChildAdded,ChildRemoved,PropertySet events & properties of TableView.CellPosition Change-Id: I77b58a63e863b16e9eeef8c09da9ae5160f5e735 * [NUI] Public some apis of TableView,Animation,NUIApplication Change-Id: I280e6389cb9d2aa537d72c183b1547ee807fcfd6 * Layer SetLayoutingRequired for added Views Change-Id: I7e9ead91ddec74fee998bdafc0e9249ffe250453 * [NUI] Add comment Add Size, Size2D comment Signed-off-by: huiyu.eun Change-Id: Ic790ea0af14e9aa76314e92ac74a034ab2f7985c * [NUI] Fix ImageLoadThread issue PLM ID : [DF181025-02207],[DF181005-00132],[DF180906-00491] heap-use-after-free issue using ASAN. The application's destructor was not called after terminated. The Join of ImageLoadThread was not called in ImageLoadThread's destructor. The cause is that AnimationImpl is still referenced in C#. Resolve by explicitly calling dispose. Change-Id: Ica66a8a7a17ff305777c173be33e0a196213e566 * All Views in a tree can be layouts Prior to this fix a View with children within a View would not become a layout if the parent View did not have SetLayout explicitly called on it. Change-Id: Ibf9b214f907a0ea8df30f54269626747c50499ca * [NUI] Set LayoutItem Width/Height specification Change-Id: Idec264329f6dc20db4692fba84ac8ee1f95067aa Signed-off-by: huiyu.eun * [NUI] Public some apis for TCT and fix an issue Here are some changes: 1. public ScrollViewPagePathEffect class 2. public TypeRegistry class 3. public PinchGesture constructor 4. public SetScrollPropertySource api 5. Fix ScrollInterval event issue Change-Id: I649f0fc464a5af0453475b7ef0dcf4df614eb34e * [NUI] Modify since_tizen tag Change-Id: Ib9ee882177d2372b8f132542cb235a3fcae5e734 * [NUI] Fix build error Change-Id: Ib1ff4dcb142ce09539dbef3b567f649e40459527 Signed-off-by: huiyu.eun * LayoutGroup to layout children Change-Id: Idff81189013e4cb0e85a8bbf13e268170b8aad31 * [NUI] Add reverse support for parse Change-Id: Ia6f55508e34cf5adbf23d0f9acd4f69da7b6d3c5 * Disable layouting until set Layout Added a (static) flag that is set once a Layout is set on any View. Until this flag is set automatic Layout setting will not occur Change-Id: Ieff5ed12df75a062a899831681f138c5aa3b6e1f * [NUI] Fix ParentOrigin doesn't work when using XAML Change-Id: I53e4b18b6c24db79c16c75b758613113152c5b25 * Remove build warnings Change-Id: I8744e8f690a4e93b199dc762c14607bd8b191718 * VisualFactory Instance to retreive from native VisualFactory.Get() is deprecated whilst Instance just gets the C# class. Added call to native to return the native VisualFactory when Instance used. Change-Id: I3be36e8f6cb70a2a1b2128c7d934fa45fe5bf570 * [NUI] Fix State issue of View Change-Id: Ide87c43406e55b9399f191dd76f8fb0b68b0cae9 * Map non dependant ResizePolicies to Specs. Maps NaturalSize, FillToParent and FitToChildren to the new layouting specifications. NaturalSize is mapped to a fixed value. Parent relative mappings not done here, need to be done in the measure once parent sizes known. Change-Id: I1f11a9dca126541cd534a386583fc36f97646ed4 * [NUI] Clean NUI codes from Adaptor.cs to Window.cs Change-Id: Ic1e5458dd1b3b4ac43cff028204254ac378d2f86 * [NUI] Add test sample for C# binding of MatchSystemLanguageDirection Change-Id: I0ac4e82c0e026ee1c5074ec00fb4677c4690ddfe * Remove StereoMode Change-Id: If19a2e403114bf5375e914584e1e7fa513f7d889 * Sync dalihub and Samsung's TizenFX codes Change-Id: I634fbe56ff9772c05f5ba59736289b3eca7d3def Signed-off-by: dongsug.song * [NUI] Remove deprecated APIs in native DALi Change-Id: Icc5d90e6e5752fc3b24ce3ea29cd11a89280b4b7 Signed-off-by: Seoyeon Kim * [NUI] Clean code: BaseComponents,UIComponents,CustomView Change-Id: I6fbd47154f179ba3a908d140f0cfb267c1e76c2d * [NUI] Manual merge from tizen50 Merged patches from tizenfx tizen_50 branch - [NUI] Fix Svace issue (#534), Add to check Null value (View.cs) - [NUI] Fix SizeWidth/Height issue (#555) (View.cs) - [NUI] ResizePolicy UseNaturalSize mapped to WrapContent (#613) (View.cs) - Improve the performance when firstly create the View (#642) (ImageView.cs, Scrollable.cs, TableView.cs, TextEditor.cs, TextField.cs, TextLabel.cs, VideoView.cs, View.cs) - [NUI] Remove GL/VK if-else, reduce dll size (#649) (LayoutPINVOKE.cs, ManualPINVOKE.cs, NDalicPINVOKE.cs, NUIApplication.cs) Change-Id: I846ad3353dd7d6ef78ec096565e491d7a6eef44a Signed-off-by: dongsug.song * [NUI] Sync dalihub and Samsung's TizenFX codes. Change-Id: I8278896c39209e076cc7e1cce3fee63a6e3a53ad Signed-off-by: huiyu.eun * [NUI] modify GetHashCode() Change-Id: Ib642ba64e746fb811be7a5e7e2cb4e82d5c6eb8a Signed-off-by: huiyu.eun * [NUI] Fix VD svace issue - add null check - add lock Change-Id: I706d1b0314e1e9096597eedc01593932945286e1 Signed-off-by: huiyu.eun * [NUI] Fix VD Svace issue Change-Id: I032ed4e562603441be4d26be68e29e0081e8c917 Signed-off-by: huiyu.eun * [NUI] Remove all warnings Change-Id: I399e6395c83664040999f4f204f51970de1dc5df * [NUI] Add API for get the original size of image * [NUI] Codacy error fix Change-Id: Ib407c7be01ad4e42913bf7896edc050e9b4bd370 Signed-off-by: dongsug.song * Make some apis as inhouse, will be internal later Change-Id: I0fc398a3b33eaab5fd12df5e8f183d9c94ab7049 * Adding LayoutController LayoutController from C# exclusive Layouting (LayoutingEx) where all layouting in processed in the NUI side. Change-Id: Ic97166e51cd2ef173f6685659f53f53253c93b21 * [NUI] Fix NUI Manual TCT issue Add Null Checker Change-Id: If07ebc246bad5a55f5614a10fb2f63f4bdd4115e Signed-off-by: huiyu.eun * [NUI] Fix PropertyMap setting issue Change-Id: I90548287836a4e4338c3a6d2dd5c1802ef24f876 Signed-off-by: huiyu.eun * [NUI] Fix svace issue Change-Id: I014294612530f600c14c237484f95dfff0c5ec96 Signed-off-by: huiyu.eun * [NUI] Update comments of ImfManager and InputMethodContext Change-Id: I72cdb3665f2e6ee3d2e355c7d18e41f74c09bba6 * Override Equals function for Color. Signed-off-by: Feng Jin * [NUI] Remove unuseful ApplicationExtensions Change-Id: Iba33bce373883d5f049e6d4e146d9e3dd33fdf44 * Fix ImageView issues: (1)Cannot get the correct ResourceUrl after seting the Border. (2)The ImageView with empty url will show the default picture after seting the Border(Actualy it should show nothing). Signed-off-by: Feng Jin * add support for CustomView OnTouch callback Change-Id: I713a91e931e58b38a09c4838a2a3fd0ace5de749 * Adding MeasureSpecification class Class for C# exclusive layouting Change-Id: I189fcf297c098e0b0446466de3aa0f4dadb26448 * Adding LayoutLengthEx class Change-Id: Ic12e7d33eaa50f66bdcd55a058f1562ad42ab4ad * Adding LayoutSizeEx class Change-Id: I15738a2fc8c40da90ebe89888cf1779b9124b98e * Adding MeasuredSizeEx Change-Id: Ia8fc53d8c1700e90d00870eef22fea9b6a0b1169 * Fix svace issue Signed-off-by: Feng Jin * [NUI] Fixed some warnings Change-Id: Id8e1c1502370f600276b30f13607b387270d7ece * [NUI] Sync Xaml code to newest (#795) * C# exclusive layouting Squashed commit of the following: updated TizenFX layouting tests GridLayout change columns bug Replacing EX class suffixes Removing existing Layout code Remove fix, Margin fix and other fixes 1) Ensure removing a View from a container removes the LayoutItem from the LayoutGroup. 2) Setting fixed specs also sets size of View. 3) LayoutController to MATCH_PARENT on height not just width. 4) Margin support added although bug raised for toolkit error/ Nested Layout support LayoutController multiple roots 1) Layouting can now starts from the first View assigned at Layout. 2) Previously had to start from the Window and then all Views would need a layout. 3) Multiple starting roots are supported. Remove AbsoluteLayout from Layer, Child removal fixed. Changing Layouts bug Pure C# Grid Layout Updating unmanaged GridLayout to a Pure C# implementation Ensure RequestLayout is called when layout dirty 1) When a child is added to a Layout the ForceLayout flag needs setting. 2) Also changing parameters of a Layout can require a ForceLayout. LayoutParamsPolices now a class 1) Previous an enum which required casting to an int when comparing. 2) Now a class with defined ints. AbsoluteLayout updated to pure C# Adding LinearLayoutEx Adding Layout base classes and updates to View, Window Added ILayoutParent,LayoutGroupEx and LayoutItemEx and LayoutData Ex classes will replace the existing classes before this branch is merged. Change-Id: I5da5b7853d1a19194f8a390f7913cf1ace1146fa * [NUI] Sync with Samsung/TizenFX master branch (tizen_5.5) Change-Id: I604d42cfb21e97199e81dcdd5b3957b8f40660fb Signed-off-by: dongsug.song * [NUI] select the whole text of text-field. In some cases, the whole text of text-field need be selected, and grab_handle and its popup need be disabled. Change-Id: I6533842ba4742e356f770734d543ace63490a8e9 * Gesture event refactor This work moved the set minimum pinch distance and can no longer be accessed from here Change-Id: I3a1d26f1e024170bd4a5829dd7937ded6246105f * LayoutItem to store View's Margin || Padding if Layout set Prevents the legacy size negotiation repositioning View with Margins or Padding.. Control-impl Resets position and size if Margin or Padding set. Solution here is to move Margin and Padding storage from View to LayoutItem so native code will not find a margin or padding hence not try to reset positions. Change-Id: I1d874fa854b0f229059ddfa3476b1426014d075e * [NUI] Fix build warnings Signed-off-by: dongsug.song Change-Id: Id9956349222ca215fde7034f65c99482a3898286 * Removal of Layouting Logs Change-Id: Ifafe4960d6d0cf4f2490025f50bdd9dc34804639 * [NUI] Remove internal DragAndDropDetector Change-Id: I87bcaf612c922a8c24cdb0b107cc99d66bb64e54 * Size2D to resize LayoutItems Change-Id: I86e40ea8e07533ddc301e082323b4683646f8a55 * Removing View Properties LayoutWidthSpecification and LayoutHeightSpecification Layouting provides WidthSpecification and HeightSpecification which replaced the LayoutWidthSpecification and LayoutHeightSpecification. Change-Id: Ia5bfeac95e32520bec298149ad5ccfbeed2dee19 * View not to use Size2D internally Change-Id: I14efea23af86c0695d729dc383992757ab699d9c * [VoiceControlManager][TCSACR-213] Add VoiceControlManager APIs (#841) * Add Tizen.Uix.VoiceControlManager Signed-off-by: sungrae jo * [VoiceControlManager] Modified code by API review * [MediaContent] Deprecate filter keyword (#832) * Fix API reference for RPC port (#864) Signed-off-by: SukHyung, Kang * [Build] Update APITool * [MediaContent] Fix description of Delete method (#866) * [NUI] Split NUI Assemblies (#865) * Split Tizen.NUI (#848) * Split Tizen.NUI (#848) (#854) * Fix compile error (#857) * Split Tizen.NUI (#848) * [NUI]Fix compile error * Fix API break (#859) * Split Tizen.NUI (#848) * [NUI]Fix compile error * [NUI]Fix API break * [NUI]Fix API break * [Build] Update APITool * Fix build error of Tizen.NUI.Design (#863) * [NUI] Fix NUI version (#842) Signed-off-by: huiyu.eun * [NUI] Add Registry return (#831) Signed-off-by: huiyu.eun * [NUI] Xaml intellisense support (#853) * [NUI] Add XAML intellisense support (#834) I merge this PR to xaml-support branch first to fix some build and packaging files with other commits. After works in xaml-support branch, I will merge it to master later. * [Build] Add Tizen.NUI.Design and dependent runtime assemblies to nuget * [Build] Add dummy assemblies to nuget instead of reference assemblies * Update .travis.yml * [VoiceControlManager][TCSACR-213] Add VoiceControlManager APIs (#841) * Add Tizen.Uix.VoiceControlManager Signed-off-by: sungrae jo * [VoiceControlManager] Modified code by API review * [MediaContent] Deprecate filter keyword (#832) * [Build] Resolve conflict APITool with master branch * [NUI]Fix the API break (Tizen.NUI.BaseHandle) * [NUI]Fix PR check warning * [OAuth2] Remove reference to AuthorizeAsync method from documentation (#852) * [OAuth2] Remove reference to AuthorizeAsync method from documentation * Update src/Tizen.Account.OAuth2/Tizen.Account.OAuth2/CodeGrantAuthorizer.cs Co-Authored-By: WonYoung Choi * Update src/Tizen.Account.OAuth2/Tizen.Account.OAuth2/ImplicitGrantAuthorizer.cs Co-Authored-By: WonYoung Choi * [NUI] Add NUI.Xaml into Platform binary (#867) * [Doc] Fix documentation warnings (#868) * Delete .gitmodules * [Build] Suppress CS0618 warnings due to internal reference (#869) Suppress CS0618(Type or member is obsolete) warnings due to internal reference * [NUI] Fixed some bad comments Change-Id: I1e84556f03fc0541baec2149a52f836e95e27096 * Add API for NUI Multi Window * [NUI] fix GetSize() for multi window * Adding Weight feature to LinearLayout Uses the View Weight property to define how free space is allocated between child Views. Weight 0 is the default. With Views A, B, C Giving A.Weight = 1 would mean 1 takes up excess space in the parent. Also giving A.C = 1 would mean A and C divide the excess space between them. B remains it's original measured size. Change-Id: I6cd13085a5713794789ee61027e371974be3fa32 * [NUI] FlexLayout support added Flex layout using the new layouting system. Uses natural size of the items. Supports: Wrap, Alignment, Direction and justrification. Currently unsupported: Explict sized items, item padding. Change-Id: Id966f11c8ececcb07e2ecc528f876787129d54b9 * [NUI] Fix Multi-window bug Change-Id: Ie945d7997d58c72ad70e1cf09fdab56c9519c67a Signed-off-by: huiyu.eun * Re-layout TextLabel when text changes size When View's change size like TextLabel setting new text it should be laid out again Change-Id: I790b2fbaab8a8869c36d9d10c3760205815627f7 * Layouting to iterate all Layers Change-Id: I005b7da027b351624c27abc56336538180907168 * Added Alignment.Center for LinearLayout Change-Id: If6d0ac3d2602bb1e399cd579337c204fab268de1 * Remove unused and dangling interops Change-Id: I005d40a5eec2d2a98adb4405b3a505ad955f3be6 * Remove unused SetUseHardwareVSync Adaptor API. Change-Id: I373643c8cdfedd126c6652337c7d3bf467f69ead * Remove layouting fixed specification API Change-Id: I37b6948337bf3bca4a9811259bf6e8ff1b1e008f * [NUI] Add GetDefaultWindow() this api for get Default Window. * [NUI] Add API for GetWindowList() After apply MultiWindow, Developer need to know list of window. * [NUI] change API for GetWindowList() change API for using native API. * Apply GaussianBlurView Devel API changes Change-Id: I98dae108ad5e50f2844f347a69d934b11fe36462 * Rename PAGE_SIZE property to VIEW_PAGE_SIZE. Change-Id: Ifd31b9ac50969a24543868127f2c09a10e65f329 * Remove Builder GetFrameBufferImage unused method Change-Id: I2dedaad5dc53c0a2ec61af005fc91d4275ccda06 * [NUI]Change GetWindowList() to static * Add method to destroy a window Change-Id: I9b9b34a8a7aa1fb1da576cab98b1495f7c998a4c * [NUI] Change API for Window Creation * Layout transitions support Change-Id: I66558d54a865544b123f2ad91554b9146f480118 * Remove APIs deprecated in Tizen 3.0 Change-Id: I3a61a27e4c9d7a9790d8457c9a60459205d1d372 * [NUI] Make public-API as Hidden-API before ACR - no logic changed, but only "[EditorBrowsable(EditorBrowsableState.Never)]" is added - before ACR is completed, we need to make new added public-API as hidden-API which is usually considered as Inhouse-API - when adding new API, need to add this "[EditorBrowsable(EditorBrowsableState.Never)]", otherwise not accepted in Samsung/TizenFX because API checker gives API break error - comment also required to be added, such as like this. "Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed." Signed-off-by: dongsug.song Change-Id: I8a707efd4c5ebb637f2928b123eabd9f702d2151 * [NUI] Add documentation for ItemView related classes to remove build warnings Change-Id: I33accb4297a936223e83745683c68a37b2d2e41a * Custom Size transition, defaults to Instant Size transition initially instant but configurable via animator. Fixed Removal issue in LayoutGroup, condition was not reset. Change-Id: Ibae03ed0c8c1b7b5935ad54dee61063945b2cdb7 * [NUI] Remove redundant lines Change-Id: I2ae14858e134286f3668db1dbaad636ca52c69e7 * [NUI] sync with samsung-tizenfx - This has been existed from 3, so ACR is required to be changed - If there is API to be changed, please put a notice on GRE-1442 (http://suprem.sec.samsung.net/jira/browse/GRE-1442) Signed-off-by: dongsug.song * [NUI] Enable cascade-property-set for Size, Position - in View.cs public Size2D Size2D : done public Size2D CurrentSize : only get, no need to fix public Size2D CurrentSize : only get, no need to fix public Size2D NaturalSize2D : only get, no need to fix public Size2D MinimumSize : done public Size2D MaximumSize : done public Position2D Position2D : done public Size Size : done public Position ParentOrigin : done public Position PivotPoint : done public Position Position : done public Position AnchorPoint : obsoleted, no need to fix public Position CurrentPosition : only get, no need to fix Signed-off-by: dongsug.song * [NUI] Add shown parameter constructor Signed-off-by: dongsug.song * Use WindowSize API instead of window.size. Change-Id: Ia6e04c5f7504f7fdc78b5a533e51a4ab448deae9 * Allow NUIApplication to create main window with given size and position * [NUI] Deprecate Layer2D enum Signed-off-by: dongsug.song * [NUI] Add TotalFrame in VectorAnimationView * [NUI] Clean up useless disposable codes * [NUI] Make CropToMask as public * [NUI] Deprecated useless property class * [NUI] Fix SynchronosLoading issue Signed-off-by: huiyu.eun --- diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs index 16913d06d..9953b80ef 100755 --- a/src/Tizen.NUI/src/internal/Camera.cs +++ b/src/Tizen.NUI/src/internal/Camera.cs @@ -17,7 +17,6 @@ namespace Tizen.NUI { - internal class Camera : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,14 +38,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -64,142 +55,34 @@ namespace Tizen.NUI base.Dispose(type); } - - - /// 3 - public class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - /// 3 - 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; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - /// 3 - protected bool disposed = false; - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - /// 3 - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - /// 3 - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.CameraActor.delete_CameraActor_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - - /// 3 - public Property() : this(Interop.CameraActor.new_CameraActor_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// 3 - public static readonly int TYPE = Interop.CameraActor.CameraActor_Property_TYPE_get(); - /// 3 - public static readonly int PROJECTION_MODE = Interop.CameraActor.CameraActor_Property_PROJECTION_MODE_get(); - /// 3 - public static readonly int FIELD_OF_VIEW = Interop.CameraActor.CameraActor_Property_FIELD_OF_VIEW_get(); - /// 3 - public static readonly int ASPECT_RATIO = Interop.CameraActor.CameraActor_Property_ASPECT_RATIO_get(); - /// 3 - public static readonly int NEAR_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_NEAR_PLANE_DISTANCE_get(); - /// 3 - public static readonly int FAR_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_FAR_PLANE_DISTANCE_get(); - /// 3 - public static readonly int LEFT_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_LEFT_PLANE_DISTANCE_get(); - /// 3 - public static readonly int RIGHT_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_RIGHT_PLANE_DISTANCE_get(); - /// 3 - public static readonly int TOP_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_TOP_PLANE_DISTANCE_get(); - /// 3 - public static readonly int BOTTOM_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get(); - /// 3 - public static readonly int TARGET_POSITION = Interop.CameraActor.CameraActor_Property_TARGET_POSITION_get(); - /// 3 - public static readonly int PROJECTION_MATRIX = Interop.CameraActor.CameraActor_Property_PROJECTION_MATRIX_get(); - /// 3 - public static readonly int VIEW_MATRIX = Interop.CameraActor.CameraActor_Property_VIEW_MATRIX_get(); - /// 3 - public static readonly int INVERT_Y_AXIS = Interop.CameraActor.CameraActor_Property_INVERT_Y_AXIS_get(); - + internal static readonly int TYPE = Interop.CameraActor.CameraActor_Property_TYPE_get(); + internal static readonly int PROJECTION_MODE = Interop.CameraActor.CameraActor_Property_PROJECTION_MODE_get(); + internal static readonly int FIELD_OF_VIEW = Interop.CameraActor.CameraActor_Property_FIELD_OF_VIEW_get(); + internal static readonly int ASPECT_RATIO = Interop.CameraActor.CameraActor_Property_ASPECT_RATIO_get(); + internal static readonly int NEAR_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_NEAR_PLANE_DISTANCE_get(); + internal static readonly int FAR_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_FAR_PLANE_DISTANCE_get(); + internal static readonly int LEFT_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_LEFT_PLANE_DISTANCE_get(); + internal static readonly int RIGHT_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_RIGHT_PLANE_DISTANCE_get(); + internal static readonly int TOP_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_TOP_PLANE_DISTANCE_get(); + internal static readonly int BOTTOM_PLANE_DISTANCE = Interop.CameraActor.CameraActor_Property_BOTTOM_PLANE_DISTANCE_get(); + internal static readonly int TARGET_POSITION = Interop.CameraActor.CameraActor_Property_TARGET_POSITION_get(); + internal static readonly int PROJECTION_MATRIX = Interop.CameraActor.CameraActor_Property_PROJECTION_MATRIX_get(); + internal static readonly int VIEW_MATRIX = Interop.CameraActor.CameraActor_Property_VIEW_MATRIX_get(); + internal static readonly int INVERT_Y_AXIS = Interop.CameraActor.CameraActor_Property_INVERT_Y_AXIS_get(); } public Camera() : this(Interop.CameraActor.CameraActor_New__SWIG_0(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + public Camera(Vector2 size) : this(Interop.CameraActor.CameraActor_New__SWIG_1(Vector2.getCPtr(size)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + public static Camera DownCast(BaseHandle handle) { Camera ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Camera; @@ -515,7 +398,5 @@ namespace Tizen.NUI SetProperty(Camera.Property.INVERT_Y_AXIS, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs index 34f6d3cc9..64dc8fcf5 100755 --- a/src/Tizen.NUI/src/internal/ItemView.cs +++ b/src/Tizen.NUI/src/internal/ItemView.cs @@ -22,7 +22,6 @@ using System.ComponentModel; namespace Tizen.NUI { - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] public class ItemView : Scrollable @@ -48,14 +47,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -89,55 +80,55 @@ namespace Tizen.NUI } } - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public new class Property { - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int LAYOUT = Interop.ItemView.ItemView_Property_LAYOUT_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int MINIMUM_SWIPE_SPEED = Interop.ItemView.ItemView_Property_MINIMUM_SWIPE_SPEED_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int MINIMUM_SWIPE_DISTANCE = Interop.ItemView.ItemView_Property_MINIMUM_SWIPE_DISTANCE_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int WHEEL_SCROLL_DISTANCE_STEP = Interop.ItemView.ItemView_Property_WHEEL_SCROLL_DISTANCE_STEP_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int SNAP_TO_ITEM_ENABLED = Interop.ItemView.ItemView_Property_SNAP_TO_ITEM_ENABLED_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int REFRESH_INTERVAL = Interop.ItemView.ItemView_Property_REFRESH_INTERVAL_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int LAYOUT_POSITION = Interop.ItemView.ItemView_Property_LAYOUT_POSITION_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int SCROLL_SPEED = Interop.ItemView.ItemView_Property_SCROLL_SPEED_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int OVERSHOOT = Interop.ItemView.ItemView_Property_OVERSHOOT_get(); - - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int SCROLL_DIRECTION = Interop.ItemView.ItemView_Property_SCROLL_DIRECTION_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int LAYOUT_ORIENTATION = Interop.ItemView.ItemView_Property_LAYOUT_ORIENTATION_get(); - /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. + [Obsolete("Deprecated in API6; Will be removed in API9.")] [EditorBrowsable(EditorBrowsableState.Never)] public static readonly int SCROLL_CONTENT_SIZE = Interop.ItemView.ItemView_Property_SCROLL_CONTENT_SIZE_get(); } @@ -147,7 +138,6 @@ namespace Tizen.NUI public ItemView(ItemFactory factory) : this(Interop.ItemView.ItemView_New(ItemFactory.getCPtr(factory)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } internal static ItemView DownCast(BaseHandle handle) @@ -647,7 +637,5 @@ namespace Tizen.NUI SetProperty(ItemView.Property.SCROLL_CONTENT_SIZE, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/internal/LinearConstrainer.cs b/src/Tizen.NUI/src/internal/LinearConstrainer.cs index 8f34231e6..89fa3836b 100755 --- a/src/Tizen.NUI/src/internal/LinearConstrainer.cs +++ b/src/Tizen.NUI/src/internal/LinearConstrainer.cs @@ -17,7 +17,6 @@ namespace Tizen.NUI { - internal class LinearConstrainer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,19 +38,10 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) @@ -65,98 +55,8 @@ namespace Tizen.NUI base.Dispose(type); } - /// 3 - public class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - /// 3 - 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; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - /// 3 - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - /// 3 - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - /// 3 - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.LinearConstrainer.delete_LinearConstrainer_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - internal Property() : this(Interop.LinearConstrainer.new_LinearConstrainer_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int VALUE = Interop.LinearConstrainer.LinearConstrainer_Property_VALUE_get(); internal static readonly int PROGRESS = Interop.LinearConstrainer.LinearConstrainer_Property_PROGRESS_get(); } @@ -164,8 +64,8 @@ namespace Tizen.NUI public LinearConstrainer() : this(Interop.LinearConstrainer.LinearConstrainer_New(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } + internal static LinearConstrainer DownCast(BaseHandle handle) { LinearConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as LinearConstrainer; @@ -185,15 +85,15 @@ namespace Tizen.NUI return ret; } - public void Apply(Property target, Property source, Vector2 range, Vector2 wrap) + public void Apply(Tizen.NUI.Property target, Tizen.NUI.Property source, Vector2 range, Vector2 wrap) { - Interop.LinearConstrainer.LinearConstrainer_Apply__SWIG_0(swigCPtr, Property.getCPtr(target), Property.getCPtr(source), Vector2.getCPtr(range), Vector2.getCPtr(wrap)); + Interop.LinearConstrainer.LinearConstrainer_Apply__SWIG_0(swigCPtr, Tizen.NUI.Property.getCPtr(target), Tizen.NUI.Property.getCPtr(source), Vector2.getCPtr(range), Vector2.getCPtr(wrap)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Apply(Property target, Property source, Vector2 range) + public void Apply(Tizen.NUI.Property target, Tizen.NUI.Property source, Vector2 range) { - Interop.LinearConstrainer.LinearConstrainer_Apply__SWIG_1(swigCPtr, Property.getCPtr(target), Property.getCPtr(source), Vector2.getCPtr(range)); + Interop.LinearConstrainer.LinearConstrainer_Apply__SWIG_1(swigCPtr, Tizen.NUI.Property.getCPtr(target), Tizen.NUI.Property.getCPtr(source), Vector2.getCPtr(range)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -216,6 +116,7 @@ namespace Tizen.NUI Tizen.NUI.Object.SetProperty(swigCPtr, LinearConstrainer.Property.VALUE, new Tizen.NUI.PropertyValue(value)); } } + public PropertyArray Progress { get @@ -229,7 +130,5 @@ namespace Tizen.NUI Tizen.NUI.Object.SetProperty(swigCPtr, LinearConstrainer.Property.PROGRESS, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/internal/Model3dView.cs b/src/Tizen.NUI/src/internal/Model3dView.cs index e58b710ce..c82144ff3 100755 --- a/src/Tizen.NUI/src/internal/Model3dView.cs +++ b/src/Tizen.NUI/src/internal/Model3dView.cs @@ -19,7 +19,6 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - internal class Model3dView : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -41,14 +40,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -66,116 +57,16 @@ namespace Tizen.NUI base.Dispose(type); } - /// 3 - public new class Property : global::System.IDisposable + internal new class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - /// 3 - 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; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - /// 3 - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - /// 3 - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - /// 3 - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.Model3DView.delete_Model3dView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - /// 3 - public Property() : this(Interop.Model3DView.new_Model3dView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// 3 - public static readonly int GEOMETRY_URL = Interop.Model3DView.Model3dView_Property_GEOMETRY_URL_get(); - /// 3 - public static readonly int MATERIAL_URL = Interop.Model3DView.Model3dView_Property_MATERIAL_URL_get(); - /// 3 - public static readonly int IMAGES_URL = Interop.Model3DView.Model3dView_Property_IMAGES_URL_get(); - /// 3 - public static readonly int ILLUMINATION_TYPE = Interop.Model3DView.Model3dView_Property_ILLUMINATION_TYPE_get(); - /// 3 - public static readonly int TEXTURE0_URL = Interop.Model3DView.Model3dView_Property_TEXTURE0_URL_get(); - /// 3 - public static readonly int TEXTURE1_URL = Interop.Model3DView.Model3dView_Property_TEXTURE1_URL_get(); - /// 3 - public static readonly int TEXTURE2_URL = Interop.Model3DView.Model3dView_Property_TEXTURE2_URL_get(); - /// 3 - public static readonly int LIGHT_POSITION = Interop.Model3DView.Model3dView_Property_LIGHT_POSITION_get(); - + internal static readonly int GEOMETRY_URL = Interop.Model3DView.Model3dView_Property_GEOMETRY_URL_get(); + internal static readonly int MATERIAL_URL = Interop.Model3DView.Model3dView_Property_MATERIAL_URL_get(); + internal static readonly int IMAGES_URL = Interop.Model3DView.Model3dView_Property_IMAGES_URL_get(); + internal static readonly int ILLUMINATION_TYPE = Interop.Model3DView.Model3dView_Property_ILLUMINATION_TYPE_get(); + internal static readonly int TEXTURE0_URL = Interop.Model3DView.Model3dView_Property_TEXTURE0_URL_get(); + internal static readonly int TEXTURE1_URL = Interop.Model3DView.Model3dView_Property_TEXTURE1_URL_get(); + internal static readonly int TEXTURE2_URL = Interop.Model3DView.Model3dView_Property_TEXTURE2_URL_get(); + internal static readonly int LIGHT_POSITION = Interop.Model3DView.Model3dView_Property_LIGHT_POSITION_get(); } public Model3dView() : this(Interop.Model3DView.Model3dView_New__SWIG_0(), true) @@ -319,7 +210,5 @@ namespace Tizen.NUI SetProperty(Model3dView.Property.LIGHT_POSITION, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/internal/PageTurnView.cs b/src/Tizen.NUI/src/internal/PageTurnView.cs index d6766202b..c644380fb 100755 --- a/src/Tizen.NUI/src/internal/PageTurnView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnView.cs @@ -14,14 +14,12 @@ * limitations under the License. * */ +using System; +using System.Runtime.InteropServices; +using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - - using System; - using System.Runtime.InteropServices; - using Tizen.NUI.BaseComponents; - internal class PageTurnView : View { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -43,14 +41,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -68,9 +58,6 @@ namespace Tizen.NUI base.Dispose(type); } - - - /// 3 public class PagePanStartedEventArgs : EventArgs { @@ -424,107 +411,11 @@ namespace Tizen.NUI return ret; } - - /// 3 - public new class Property : global::System.IDisposable + internal new class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - /// 3 - 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; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - /// 3 - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - /// 3 - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - /// 3 - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.PageTurnView.delete_PageTurnView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - /// 3 - public Property() : this(Interop.PageTurnView.new_PageTurnView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// 3 - public static readonly int VIEW_PAGE_SIZE = Interop.PageTurnView.PageTurnView_Property_VIEW_PAGE_SIZE_get(); - /// 3 - public static readonly int CURRENT_PAGE_ID = Interop.PageTurnView.PageTurnView_Property_CURRENT_PAGE_ID_get(); - /// 3 - public static readonly int SPINE_SHADOW = Interop.PageTurnView.PageTurnView_Property_SPINE_SHADOW_get(); - + internal static readonly int VIEW_PAGE_SIZE = Interop.PageTurnView.PageTurnView_Property_VIEW_PAGE_SIZE_get(); + internal static readonly int CURRENT_PAGE_ID = Interop.PageTurnView.PageTurnView_Property_CURRENT_PAGE_ID_get(); + internal static readonly int SPINE_SHADOW = Interop.PageTurnView.PageTurnView_Property_SPINE_SHADOW_get(); } public PageTurnView() : this(Interop.PageTurnView.new_PageTurnView__SWIG_0(), true) @@ -619,7 +510,5 @@ namespace Tizen.NUI SetProperty(PageTurnView.Property.SPINE_SHADOW, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/internal/PathConstrainer.cs b/src/Tizen.NUI/src/internal/PathConstrainer.cs index b12294089..70d9167cd 100755 --- a/src/Tizen.NUI/src/internal/PathConstrainer.cs +++ b/src/Tizen.NUI/src/internal/PathConstrainer.cs @@ -17,7 +17,6 @@ namespace Tizen.NUI { - internal class PathConstrainer : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,14 +38,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -65,105 +56,11 @@ namespace Tizen.NUI base.Dispose(type); } - - - /// 3 - public class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - /// 3 - 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; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - /// 3 - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - /// 3 - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - /// 3 - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.PathConstrainer.delete_PathConstrainer_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - /// 3 - public Property() : this(Interop.PathConstrainer.new_PathConstrainer_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int FORWARD = Interop.PathConstrainer.PathConstrainer_Property_FORWARD_get(); internal static readonly int POINTS = Interop.PathConstrainer.PathConstrainer_Property_POINTS_get(); internal static readonly int CONTROL_POINTS = Interop.PathConstrainer.PathConstrainer_Property_CONTROL_POINTS_get(); - } public PathConstrainer() : this(Interop.PathConstrainer.PathConstrainer_New(), true) @@ -190,15 +87,15 @@ namespace Tizen.NUI return ret; } - public void Apply(Property target, Property source, Vector2 range, Vector2 wrap) + public void Apply(Tizen.NUI.Property target, Tizen.NUI.Property source, Vector2 range, Vector2 wrap) { - Interop.PathConstrainer.PathConstrainer_Apply__SWIG_0(swigCPtr, Property.getCPtr(target), Property.getCPtr(source), Vector2.getCPtr(range), Vector2.getCPtr(wrap)); + Interop.PathConstrainer.PathConstrainer_Apply__SWIG_0(swigCPtr, Tizen.NUI.Property.getCPtr(target), Tizen.NUI.Property.getCPtr(source), Vector2.getCPtr(range), Vector2.getCPtr(wrap)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Apply(Property target, Property source, Vector2 range) + public void Apply(Tizen.NUI.Property target, Tizen.NUI.Property source, Vector2 range) { - Interop.PathConstrainer.PathConstrainer_Apply__SWIG_1(swigCPtr, Property.getCPtr(target), Property.getCPtr(source), Vector2.getCPtr(range)); + Interop.PathConstrainer.PathConstrainer_Apply__SWIG_1(swigCPtr, Tizen.NUI.Property.getCPtr(target), Tizen.NUI.Property.getCPtr(source), Vector2.getCPtr(range)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -249,7 +146,5 @@ namespace Tizen.NUI Tizen.NUI.Object.SetProperty(swigCPtr, PathConstrainer.Property.CONTROL_POINTS, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/internal/RenderTask.cs b/src/Tizen.NUI/src/internal/RenderTask.cs index 16d52e91b..042e1360a 100755 --- a/src/Tizen.NUI/src/internal/RenderTask.cs +++ b/src/Tizen.NUI/src/internal/RenderTask.cs @@ -14,10 +14,10 @@ * limitations under the License. * */ +using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - using Tizen.NUI.BaseComponents; internal class RenderTask : Animatable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -39,19 +39,10 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) @@ -73,108 +64,12 @@ namespace Tizen.NUI return ret; } - /// 3 - public class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - /// 3 - 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; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - /// 3 - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - /// 3 - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - /// 3 - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.RenderTask.delete_RenderTask_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - /// 3 - public Property() : this(Interop.RenderTask.new_RenderTask_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// 3 - public static readonly int VIEWPORT_POSITION = Interop.RenderTask.RenderTask_Property_VIEWPORT_POSITION_get(); - /// 3 - public static readonly int VIEWPORT_SIZE = Interop.RenderTask.RenderTask_Property_VIEWPORT_SIZE_get(); - /// 3 - public static readonly int CLEAR_COLOR = Interop.RenderTask.RenderTask_Property_CLEAR_COLOR_get(); - /// 3 - public static readonly int REQUIRES_SYNC = Interop.RenderTask.RenderTask_Property_REQUIRES_SYNC_get(); - + internal static readonly int VIEWPORT_POSITION = Interop.RenderTask.RenderTask_Property_VIEWPORT_POSITION_get(); + internal static readonly int VIEWPORT_SIZE = Interop.RenderTask.RenderTask_Property_VIEWPORT_SIZE_get(); + internal static readonly int CLEAR_COLOR = Interop.RenderTask.RenderTask_Property_CLEAR_COLOR_get(); + internal static readonly int REQUIRES_SYNC = Interop.RenderTask.RenderTask_Property_REQUIRES_SYNC_get(); } internal static SWIGTYPE_p_f_r_Dali__Vector2__bool DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION @@ -560,7 +455,5 @@ namespace Tizen.NUI SetProperty(RenderTask.Property.REQUIRES_SYNC, new Tizen.NUI.PropertyValue(value)); } } - } - } diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index da5d85d24..b819bf4e6 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -199,17 +199,14 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { + imageView._synchronosLoading = (bool) newValue; imageView.UpdateImage(NpatchImageVisualProperty.SynchronousLoading, new PropertyValue((bool)newValue)); } }, defaultValueCreator: (bindable) => { var imageView = (ImageView)bindable; - bool ret = false; - PropertyMap imageMap = new PropertyMap(); - Tizen.NUI.Object.GetProperty(imageView.swigCPtr, ImageView.Property.IMAGE).Get(imageMap); - imageMap.Find(ImageVisualProperty.SynchronousLoading)?.Get(out ret); - return ret; + return imageView._synchronosLoading; }); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -242,6 +239,7 @@ namespace Tizen.NUI.BaseComponents private Rectangle _border; private string _resourceUrl = ""; + private bool _synchronosLoading = false; /// /// Creates an initialized ImageView. @@ -714,7 +712,6 @@ namespace Tizen.NUI.BaseComponents /// Whether to crop image to mask or scale mask to fit image. /// /// 6 - [EditorBrowsable(EditorBrowsableState.Never)] public bool CropToMask { get @@ -978,7 +975,9 @@ namespace Tizen.NUI.BaseComponents temp.Insert(Visual.Property.Type, new PropertyValue((int)Visual.Type.NPatch)); temp.Insert(NpatchImageVisualProperty.Border, new PropertyValue(_border)); } - + + temp.Insert(NpatchImageVisualProperty.SynchronousLoading, new PropertyValue(_synchronosLoading)); + if (value != null) { temp.Insert(key, value); diff --git a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs index a6b602371..48d7c65db 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs @@ -544,14 +544,6 @@ namespace Tizen.NUI.BaseComponents return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -764,77 +756,107 @@ namespace Tizen.NUI.BaseComponents /// Enumeration for the instance of properties belonging to the Scrollable class. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public new class Property { /// /// The color of the overshoot effect. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int OVERSHOOT_EFFECT_COLOR = Interop.Scrollable.Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get(); /// /// The speed of overshoot animation in pixels per second. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int OVERSHOOT_ANIMATION_SPEED = Interop.Scrollable.Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get(); /// /// Whether to enables or disable scroll overshoot. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int OVERSHOOT_ENABLED = Interop.Scrollable.Scrollable_Property_OVERSHOOT_ENABLED_get(); /// /// The size of the overshoot. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int OVERSHOOT_SIZE = Interop.Scrollable.Scrollable_Property_OVERSHOOT_SIZE_get(); /// /// scrollToAlphaFunction. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_TO_ALPHA_FUNCTION = Interop.Scrollable.Scrollable_Property_SCROLL_TO_ALPHA_FUNCTION_get(); /// /// scrollRelativePosition /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_RELATIVE_POSITION = Interop.Scrollable.Scrollable_Property_SCROLL_RELATIVE_POSITION_get(); /// /// scrollPositionMin /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_MIN = Interop.Scrollable.Scrollable_Property_SCROLL_POSITION_MIN_get(); /// /// scrollPositionMinX. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_MIN_X = Interop.Scrollable.Scrollable_Property_SCROLL_POSITION_MIN_X_get(); /// /// scrollPositionMinY. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_MIN_Y = Interop.Scrollable.Scrollable_Property_SCROLL_POSITION_MIN_Y_get(); /// /// scrollPositionMax. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_MAX = Interop.Scrollable.Scrollable_Property_SCROLL_POSITION_MAX_get(); /// /// scrollPositionMaxX. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_MAX_X = Interop.Scrollable.Scrollable_Property_SCROLL_POSITION_MAX_X_get(); /// /// scrollPositionMaxY. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_MAX_Y = Interop.Scrollable.Scrollable_Property_SCROLL_POSITION_MAX_Y_get(); /// /// canScrollVertical /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int CAN_SCROLL_VERTICAL = Interop.Scrollable.Scrollable_Property_CAN_SCROLL_VERTICAL_get(); /// /// canScrollHorizontal. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int CAN_SCROLL_HORIZONTAL = Interop.Scrollable.Scrollable_Property_CAN_SCROLL_HORIZONTAL_get(); } } diff --git a/src/Tizen.NUI/src/public/PanGestureDetector.cs b/src/Tizen.NUI/src/public/PanGestureDetector.cs index 5c9efe976..581ac984a 100755 --- a/src/Tizen.NUI/src/public/PanGestureDetector.cs +++ b/src/Tizen.NUI/src/public/PanGestureDetector.cs @@ -21,7 +21,6 @@ using System.ComponentModel; namespace Tizen.NUI { - /// /// This class emits a signals when a pan gesture occurs.
/// @@ -539,14 +538,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -628,109 +619,15 @@ namespace Tizen.NUI } } - internal class Property : global::System.IDisposable + internal class Property { - public static readonly int SCREEN_POSITION = Interop.PanGestureDetector.PanGestureDetector_Property_SCREEN_POSITION_get(); - - public static readonly int SCREEN_DISPLACEMENT = Interop.PanGestureDetector.PanGestureDetector_Property_SCREEN_DISPLACEMENT_get(); - - public static readonly int SCREEN_VELOCITY = Interop.PanGestureDetector.PanGestureDetector_Property_SCREEN_VELOCITY_get(); - - public static readonly int LOCAL_POSITION = Interop.PanGestureDetector.PanGestureDetector_Property_LOCAL_POSITION_get(); - - public static readonly int LOCAL_DISPLACEMENT = Interop.PanGestureDetector.PanGestureDetector_Property_LOCAL_DISPLACEMENT_get(); - - public static readonly int LOCAL_VELOCITY = Interop.PanGestureDetector.PanGestureDetector_Property_LOCAL_VELOCITY_get(); - - public static readonly int PANNING = Interop.PanGestureDetector.PanGestureDetector_Property_PANNING_get(); - - protected bool swigCMemOwn; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - - public Property() : this(Interop.PanGestureDetector.new_PanGestureDetector_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - 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; - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - Interop.PanGestureDetector.delete_PanGestureDetector_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - + internal static readonly int SCREEN_POSITION = Interop.PanGestureDetector.PanGestureDetector_Property_SCREEN_POSITION_get(); + internal static readonly int SCREEN_DISPLACEMENT = Interop.PanGestureDetector.PanGestureDetector_Property_SCREEN_DISPLACEMENT_get(); + internal static readonly int SCREEN_VELOCITY = Interop.PanGestureDetector.PanGestureDetector_Property_SCREEN_VELOCITY_get(); + internal static readonly int LOCAL_POSITION = Interop.PanGestureDetector.PanGestureDetector_Property_LOCAL_POSITION_get(); + internal static readonly int LOCAL_DISPLACEMENT = Interop.PanGestureDetector.PanGestureDetector_Property_LOCAL_DISPLACEMENT_get(); + internal static readonly int LOCAL_VELOCITY = Interop.PanGestureDetector.PanGestureDetector_Property_LOCAL_VELOCITY_get(); + internal static readonly int PANNING = Interop.PanGestureDetector.PanGestureDetector_Property_PANNING_get(); } } - } diff --git a/src/Tizen.NUI/src/public/Renderer.cs b/src/Tizen.NUI/src/public/Renderer.cs index 82c117678..6325fe117 100755 --- a/src/Tizen.NUI/src/public/Renderer.cs +++ b/src/Tizen.NUI/src/public/Renderer.cs @@ -14,6 +14,7 @@ * limitations under the License. * */ +using System; using System.ComponentModel; using System.Runtime.InteropServices; @@ -595,19 +596,10 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - if (swigCPtr.Handle != global::System.IntPtr.Zero) { if (swigCMemOwn) @@ -657,129 +649,178 @@ namespace Tizen.NUI /// Enumeration for instances of properties belonging to the Renderer class. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public class Property { /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int DEPTH_INDEX = Interop.Renderer.Renderer_Property_DEPTH_INDEX_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int FACE_CULLING_MODE = Interop.Renderer.Renderer_Property_FACE_CULLING_MODE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_MODE = Interop.Renderer.Renderer_Property_BLEND_MODE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_EQUATION_RGB = Interop.Renderer.Renderer_Property_BLEND_EQUATION_RGB_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_EQUATION_ALPHA = Interop.Renderer.Renderer_Property_BLEND_EQUATION_ALPHA_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_FACTOR_SRC_RGB = Interop.Renderer.Renderer_Property_BLEND_FACTOR_SRC_RGB_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_FACTOR_DEST_RGB = Interop.Renderer.Renderer_Property_BLEND_FACTOR_DEST_RGB_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_FACTOR_SRC_ALPHA = Interop.Renderer.Renderer_Property_BLEND_FACTOR_SRC_ALPHA_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_FACTOR_DEST_ALPHA = Interop.Renderer.Renderer_Property_BLEND_FACTOR_DEST_ALPHA_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_COLOR = Interop.Renderer.Renderer_Property_BLEND_COLOR_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int BLEND_PRE_MULTIPLIED_ALPHA = Interop.Renderer.Renderer_Property_BLEND_PRE_MULTIPLIED_ALPHA_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int INDEX_RANGE_FIRST = Interop.Renderer.Renderer_Property_INDEX_RANGE_FIRST_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int INDEX_RANGE_COUNT = Interop.Renderer.Renderer_Property_INDEX_RANGE_COUNT_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int DEPTH_WRITE_MODE = Interop.Renderer.Renderer_Property_DEPTH_WRITE_MODE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int DEPTH_FUNCTION = Interop.Renderer.Renderer_Property_DEPTH_FUNCTION_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int DEPTH_TEST_MODE = Interop.Renderer.Renderer_Property_DEPTH_TEST_MODE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int RENDER_MODE = Interop.Renderer.Renderer_Property_RENDER_MODE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_FUNCTION = Interop.Renderer.Renderer_Property_STENCIL_FUNCTION_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_FUNCTION_MASK = Interop.Renderer.Renderer_Property_STENCIL_FUNCTION_MASK_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_FUNCTION_REFERENCE = Interop.Renderer.Renderer_Property_STENCIL_FUNCTION_REFERENCE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_MASK = Interop.Renderer.Renderer_Property_STENCIL_MASK_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_OPERATION_ON_FAIL = Interop.Renderer.Renderer_Property_STENCIL_OPERATION_ON_FAIL_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_OPERATION_ON_Z_FAIL = Interop.Renderer.Renderer_Property_STENCIL_OPERATION_ON_Z_FAIL_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STENCIL_OPERATION_ON_Z_PASS = Interop.Renderer.Renderer_Property_STENCIL_OPERATION_ON_Z_PASS_get(); } - } } diff --git a/src/Tizen.NUI/src/public/Shader.cs b/src/Tizen.NUI/src/public/Shader.cs index e92dff7a5..7172cb06a 100755 --- a/src/Tizen.NUI/src/public/Shader.cs +++ b/src/Tizen.NUI/src/public/Shader.cs @@ -14,6 +14,7 @@ * limitations under the License. * */ +using System; using System.ComponentModel; namespace Tizen.NUI @@ -36,7 +37,6 @@ namespace Tizen.NUI public Shader(string vertexShader, string fragmentShader, Shader.Hint.Value hints) : this(Interop.Shader.Shader_New__SWIG_0(vertexShader, fragmentShader, (int)hints), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } /// @@ -48,7 +48,6 @@ namespace Tizen.NUI public Shader(string vertexShader, string fragmentShader) : this(Interop.Shader.Shader_New__SWIG_1(vertexShader, fragmentShader), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } /// @@ -90,14 +89,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -151,6 +142,8 @@ namespace Tizen.NUI /// Enumeration for instances of properties belonging to the Shader class. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public class Property { /// @@ -158,8 +151,9 @@ namespace Tizen.NUI /// Format: {"vertex":"","fragment":"",hints:"","vertexPrefix":"","fragmentPrefix":""} /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int PROGRAM = Interop.Shader.Shader_Property_PROGRAM_get(); } - } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs index 494e1c4c2..c5e9f8271 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs @@ -1368,14 +1368,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -1417,137 +1409,191 @@ namespace Tizen.NUI /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public new class Property { /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int WRAP_ENABLED = Interop.ScrollView.ScrollView_Property_WRAP_ENABLED_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int PANNING_ENABLED = Interop.ScrollView.ScrollView_Property_PANNING_ENABLED_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int AXIS_AUTO_LOCK_ENABLED = Interop.ScrollView.ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int WHEEL_SCROLL_DISTANCE_STEP = Interop.ScrollView.ScrollView_Property_WHEEL_SCROLL_DISTANCE_STEP_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_MODE = Interop.ScrollView.ScrollView_Property_SCROLL_MODE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION = Interop.ScrollView.ScrollView_Property_SCROLL_POSITION_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_PRE_POSITION = Interop.ScrollView.ScrollView_Property_SCROLL_PRE_POSITION_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_PRE_POSITION_X = Interop.ScrollView.ScrollView_Property_SCROLL_PRE_POSITION_X_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_PRE_POSITION_Y = Interop.ScrollView.ScrollView_Property_SCROLL_PRE_POSITION_Y_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_PRE_POSITION_MAX = Interop.ScrollView.ScrollView_Property_SCROLL_PRE_POSITION_MAX_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_PRE_POSITION_MAX_X = Interop.ScrollView.ScrollView_Property_SCROLL_PRE_POSITION_MAX_X_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_PRE_POSITION_MAX_Y = Interop.ScrollView.ScrollView_Property_SCROLL_PRE_POSITION_MAX_Y_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int OVERSHOOT_X = Interop.ScrollView.ScrollView_Property_OVERSHOOT_X_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int OVERSHOOT_Y = Interop.ScrollView.ScrollView_Property_OVERSHOOT_Y_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_FINAL = Interop.ScrollView.ScrollView_Property_SCROLL_FINAL_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_FINAL_X = Interop.ScrollView.ScrollView_Property_SCROLL_FINAL_X_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_FINAL_Y = Interop.ScrollView.ScrollView_Property_SCROLL_FINAL_Y_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int WRAP = Interop.ScrollView.ScrollView_Property_WRAP_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int PANNING = Interop.ScrollView.ScrollView_Property_PANNING_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLLING = Interop.ScrollView.ScrollView_Property_SCROLLING_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_DOMAIN_SIZE = Interop.ScrollView.ScrollView_Property_SCROLL_DOMAIN_SIZE_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_DOMAIN_SIZE_X = Interop.ScrollView.ScrollView_Property_SCROLL_DOMAIN_SIZE_X_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_DOMAIN_SIZE_Y = Interop.ScrollView.ScrollView_Property_SCROLL_DOMAIN_SIZE_Y_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_DOMAIN_OFFSET = Interop.ScrollView.ScrollView_Property_SCROLL_DOMAIN_OFFSET_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int SCROLL_POSITION_DELTA = Interop.ScrollView.ScrollView_Property_SCROLL_POSITION_DELTA_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int START_PAGE_POSITION = Interop.ScrollView.ScrollView_Property_START_PAGE_POSITION_get(); } diff --git a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs index cd0c57fe6..7214c091a 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs @@ -14,6 +14,7 @@ * limitations under the License. * */ +using System; using System.ComponentModel; using Tizen.NUI.Binding; @@ -159,14 +160,6 @@ namespace Tizen.NUI return; } - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - //Release your own unmanaged resources here. //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. @@ -188,22 +181,30 @@ namespace Tizen.NUI /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public new class Property { /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int STATE_VISUALS = Interop.ToggleButton.ToggleButton_Property_STATE_VISUALS_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int TOOLTIPS = Interop.ToggleButton.ToggleButton_Property_TOOLTIPS_get(); /// /// This should be internal, please do not use. /// /// 3 + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("Deprecated in API6; Will be removed in API9.")] public static readonly int CURRENT_STATE_INDEX = Interop.ToggleButton.ToggleButton_Property_CURRENT_STATE_INDEX_get(); } }