Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'github_origin/master' into github_sandb…

…ox_master
  • Loading branch information...
commit caff6d9ad4edb849c16d3416b9eb11a84d008d1f 2 parents 0834188 + b0c1a79
@spiridon-alexandru spiridon-alexandru authored
View
2  libs/MAUI/WidgetSkin.cpp
@@ -33,6 +33,8 @@ namespace MAUI {
endX(32),
startY(16),
endY(32),
+ imageWidth(endX),
+ imageHeight(endY),
selectedTransparent(true),
unselectedTransparent(true)
{
View
3  runtimes/cpp/platforms/iphone/Classes/UI/Widgets/ListViewItemWidget.h
@@ -18,6 +18,9 @@
#import <Foundation/Foundation.h>
#import "IWidget.h"
+// String constant used to create UITableViewCell objects.
+extern NSString* const kTableCellReuseIdentifier;
+
@interface ListViewItemWidget : IWidget {
}
View
7 runtimes/cpp/platforms/iphone/Classes/UI/Widgets/ListViewItemWidget.mm
@@ -24,14 +24,15 @@
MAKE_UIWRAPPER_LAYOUTING_IMPLEMENTATION(MoSync, UITableViewCell)
+// String constant used to create UITableViewCell objects.
+NSString* const kTableCellReuseIdentifier = @"SimpleTableIdentifier";
+
@implementation ListViewItemWidget
- (id)init {
-
- static NSString *SimpleTableIdentifier = @"SimpleTableIdentifier";
MoSyncUITableViewCell *cell = nil;
cell = [[MoSyncUITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
- reuseIdentifier:SimpleTableIdentifier];
+ reuseIdentifier:kTableCellReuseIdentifier];
[cell setWidget:self];
cell.selectionStyle = UITableViewCellSelectionStyleNone;
view = cell;
View
8 runtimes/cpp/platforms/iphone/Classes/UI/Widgets/ListViewWidget.mm
@@ -31,6 +31,14 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
NSUInteger row = [indexPath row];
+ if (row >= [children count])
+ {
+ UITableViewCell* cell =
+ [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
+ reuseIdentifier:kTableCellReuseIdentifier] autorelease];
+ return cell;
+ }
+
IWidget* widget = [children objectAtIndex:row];
UITableViewCell* cell = (UITableViewCell*)[widget getView];
[cell setFrame:CGRectMake(cell.frame.origin.x, cell.frame.origin.y, cell.frame.size.width, tableView.rowHeight)];
View
2  runtimes/csharp/windowsphone/mosync/mosyncRuntime/Source/Modules/NativeUI/MoSyncNativeUIWindowsPhone.cs
@@ -265,7 +265,7 @@ public string Enabled
if (objType.GetProperty("IsEnabled") != null)
{
var property = objType.GetProperty("IsEnabled");
- return (string)(property.GetValue(mView, null));
+ return (property.GetValue(mView, null)).ToString();
}
return null;
}
Please sign in to comment.
Something went wrong with that request. Please try again.