Skip to content

Actually you can't set the dataSource to null. #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Actually you can't set the dataSource to null. #99

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0012d08
Actually you can't set dataSource to null.
aW4KeNiNG Feb 1, 2017
433a8a6
Avoid dataSource creation.
aW4KeNiNG Feb 1, 2017
c0c9568
Merge branch 'master' into listDataSourceNull
aW4KeNiNG Jul 20, 2017
066dca7
Fix.
aW4KeNiNG Jul 20, 2017
9df320f
Fix.
aW4KeNiNG Aug 8, 2017
bb8e562
Merge branch 'master' into listDataSourceNull
aW4KeNiNG Feb 18, 2018
ab38da0
Fixes.
aW4KeNiNG Feb 18, 2018
f1c010c
Code climate fixes.
aW4KeNiNG Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions haxe/ui/containers/ListView.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import haxe.ui.core.InteractiveComponent;
import haxe.ui.core.ItemRenderer;
import haxe.ui.core.MouseEvent;
import haxe.ui.core.UIEvent;
import haxe.ui.data.ArrayDataSource;
import haxe.ui.data.DataSource;
import haxe.ui.data.transformation.NativeTypeTransformer;
import haxe.ui.util.Variant;
Expand Down Expand Up @@ -101,7 +100,7 @@ class ListView extends ScrollView implements IDataComponent {

return value;
}

public function resetSelection() {
selectedIndex = NO_SELECTION;
}
Expand Down Expand Up @@ -164,11 +163,6 @@ class ListView extends ScrollView implements IDataComponent {
private var _dataSource:DataSource<Dynamic>;
public var dataSource(get, set):DataSource<Dynamic>;
private function get_dataSource():DataSource<Dynamic> {
if (_dataSource == null) {
_dataSource = new ArrayDataSource(new NativeTypeTransformer());
//_dataSource.onChange = onDataSourceChanged;
behaviourGet("dataSource");
}
return _dataSource;
}
private function set_dataSource(value:DataSource<Dynamic>):DataSource<Dynamic> {
Expand All @@ -185,6 +179,9 @@ class ListView extends ScrollView implements IDataComponent {

private function syncUI() {
if (_dataSource == null) {
if (contents != null) {
contents.removeAllComponents();
}
return;
}

Expand Down Expand Up @@ -308,7 +305,7 @@ class ListView extends ScrollView implements IDataComponent {
if (contents == null) {
return result;
}

//ItemHeight
var n:Int = 0;
var cy:Float = contents.layout.paddingTop + contents.layout.paddingBottom;
Expand Down