Mercurial > dwindows
comparison ios/dw.m @ 2420:384d076ed52a
iOS: Minor fix for initial notebook page remaining visible on page change.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sat, 03 Apr 2021 19:14:29 +0000 |
parents | 65ff339e9cd2 |
children | d88928a85436 |
comparison
equal
deleted
inserted
replaced
2419:65ff339e9cd2 | 2420:384d076ed52a |
---|---|
1531 } | 1531 } |
1532 -(void *)userdata; | 1532 -(void *)userdata; |
1533 -(void)setUserdata:(void *)input; | 1533 -(void)setUserdata:(void *)input; |
1534 -(int)pageid; | 1534 -(int)pageid; |
1535 -(void)setPageid:(int)input; | 1535 -(void)setPageid:(int)input; |
1536 -(void)setVisible:(DWNotebookPage *)input; | |
1536 -(UISegmentedControl *)tabs; | 1537 -(UISegmentedControl *)tabs; |
1537 -(NSMutableArray<DWNotebookPage *> *)views; | 1538 -(NSMutableArray<DWNotebookPage *> *)views; |
1538 -(void)pageChanged:(id)sender; | 1539 -(void)pageChanged:(id)sender; |
1539 @end | 1540 @end |
1540 | 1541 |
1553 } | 1554 } |
1554 -(void *)userdata { return userdata; } | 1555 -(void *)userdata { return userdata; } |
1555 -(void)setUserdata:(void *)input { userdata = input; } | 1556 -(void)setUserdata:(void *)input { userdata = input; } |
1556 -(int)pageid { return pageid; } | 1557 -(int)pageid { return pageid; } |
1557 -(void)setPageid:(int)input { pageid = input; } | 1558 -(void)setPageid:(int)input { pageid = input; } |
1559 -(void)setVisible:(DWNotebookPage *)input { visible = input; } | |
1558 -(UISegmentedControl *)tabs { return tabs; } | 1560 -(UISegmentedControl *)tabs { return tabs; } |
1559 -(NSMutableArray<DWNotebookPage *> *)views { return views; }; | 1561 -(NSMutableArray<DWNotebookPage *> *)views { return views; }; |
1560 -(void)pageChanged:(id)sender | 1562 -(void)pageChanged:(id)sender |
1561 { | 1563 { |
1562 NSInteger intpageid = [tabs selectedSegmentIndex]; | 1564 NSInteger intpageid = [tabs selectedSegmentIndex]; |
2520 | 2522 |
2521 /* If there is no selected segment, select the first one... */ | 2523 /* If there is no selected segment, select the first one... */ |
2522 [[notebook tabs] setSelectedSegmentIndex:0]; | 2524 [[notebook tabs] setSelectedSegmentIndex:0]; |
2523 intpageid = 0; | 2525 intpageid = 0; |
2524 [notepage setHidden:NO]; | 2526 [notepage setHidden:NO]; |
2527 [notebook setVisible:notepage]; | |
2525 } | 2528 } |
2526 } | 2529 } |
2527 | 2530 |
2528 if(intpageid != -1 && intpageid < [[notebook views] count]) | 2531 if(intpageid != -1 && intpageid < [[notebook views] count]) |
2529 { | 2532 { |