mirror of
				https://github.com/labwc/labwc.git
				synced 2025-11-03 09:01:51 -05:00 
			
		
		
		
	menu: Add generic menu_init() entry point
This commit is contained in:
		
							parent
							
								
									aa4ef94af0
								
							
						
					
					
						commit
						ccf68c5950
					
				
					 3 changed files with 14 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -575,8 +575,8 @@ menu_hide_submenu(const char *id)
 | 
			
		|||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
menu_init_rootmenu(struct server *server)
 | 
			
		||||
static void
 | 
			
		||||
init_rootmenu(struct server *server)
 | 
			
		||||
{
 | 
			
		||||
	parse_xml("menu.xml", server);
 | 
			
		||||
	struct menu *menu = menu_get_by_id("root-menu");
 | 
			
		||||
| 
						 | 
				
			
			@ -594,8 +594,8 @@ menu_init_rootmenu(struct server *server)
 | 
			
		|||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
menu_init_windowmenu(struct server *server)
 | 
			
		||||
static void
 | 
			
		||||
init_windowmenu(struct server *server)
 | 
			
		||||
{
 | 
			
		||||
	struct menu *menu = menu_get_by_id("client-menu");
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -640,6 +640,13 @@ menu_init_windowmenu(struct server *server)
 | 
			
		|||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
menu_init(struct server *server)
 | 
			
		||||
{
 | 
			
		||||
	init_rootmenu(server);
 | 
			
		||||
	init_windowmenu(server);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
menu_finish(void)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			@ -799,6 +806,5 @@ menu_reconfigure(struct server *server)
 | 
			
		|||
{
 | 
			
		||||
	menu_finish();
 | 
			
		||||
	server->menu_current = NULL;
 | 
			
		||||
	menu_init_rootmenu(server);
 | 
			
		||||
	menu_init_windowmenu(server);
 | 
			
		||||
	menu_init(server);
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue