mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2154 from lakkatv/cocoa

Browse Source 
Display the menu title in the uiviewcontroller title, and move the co…
This commit is contained in:
Twinaphex 2015-09-22 01:28:49 +02:00
commit 05704f6b9c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/drivers/cocoa/cocoatouch_menu.m
View File

@ -546,20 +546,18 @@ replacementString:(NSString *)string
- (NSString*)tableView:(UITableView*)tableView - (NSString*)tableView:(UITableView*)tableView
titleForHeaderInSection:(NSInteger)section titleForHeaderInSection:(NSInteger)section
{ {
if (self.hidesHeaders)
return nil; return nil;
return self.sections[section][0];
} }
- (NSInteger)tableView:(UITableView *)tableView - (NSInteger)tableView:(UITableView *)tableView
numberOfRowsInSection:(NSInteger)section numberOfRowsInSection:(NSInteger)section
{ {
return [self.sections[section] count] - 1; return [self.sections[section] count];
} }
- (id)itemForIndexPath:(NSIndexPath*)indexPath - (id)itemForIndexPath:(NSIndexPath*)indexPath
{ {
return self.sections[indexPath.section][indexPath.row + 1]; return self.sections[indexPath.section][indexPath.row];
} }
- (UITableViewCell*)tableView:(UITableView *)tableView - (UITableViewCell*)tableView:(UITableView *)tableView
@ -615,6 +613,7 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
@end @end
@interface RAMainMenu : RAMenuBase<RAMenuActioner> @interface RAMainMenu : RAMenuBase<RAMenuActioner>
@property(nonatomic) UILabel *osdmessage;
@end @end
@implementation RAMainMenu @implementation RAMainMenu
@ -628,7 +627,17 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
{ {
char title_msg[256];
[self reloadData]; [self reloadData];
self.osdmessage = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 300, 44)];
self.osdmessage.backgroundColor = [UIColor clearColor];
UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithCustomView:self.osdmessage];
[self setToolbarItems: [NSArray arrayWithObject:item]];
menu_entries_get_core_title(title_msg, sizeof(title_msg));
self.osdmessage.text = BOXSTRING(title_msg);
} }
- (void)willReloadData - (void)willReloadData
@ -641,10 +650,10 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
everything = [NSMutableArray array]; everything = [NSMutableArray array];
menu_entries_get_core_title(title_msg, sizeof(title_msg)); menu_entries_get_core_title(title_msg, sizeof(title_msg));
self.title = BOXSTRING(title_msg); self.osdmessage.text = BOXSTRING(title_msg);
menu_entries_get_title(title, sizeof(title)); menu_entries_get_title(title, sizeof(title));
[everything addObject:BOXSTRING(title)]; self.title = BOXSTRING(title);
end = menu_entries_get_end(); end = menu_entries_get_end();
for (i = menu_entries_get_start(); i < end; i++) for (i = menu_entries_get_start(); i < end; i++)