moved submenu to the end of the struct to make menu desclaration look better, formatted

This commit is contained in:
Serge A. Zaitsev
2017-01-12 12:48:32 +02:00
parent b677473cd4
commit a1e7598f44
2 changed files with 31 additions and 32 deletions

View File

@@ -48,33 +48,30 @@ static void submenu_cb(struct tray_menu *item) {
// Test tray init
static struct tray tray = {
.icon = TRAY_ICON1,
.menu = (struct tray_menu[]){
{"Hello", 0, 0, NULL, hello_cb, NULL},
{"Checked", 0, 1, NULL, toggle_cb, NULL},
{"Disabled", 1, 0, NULL, NULL, NULL},
{"-", 0, 0, NULL, NULL, NULL},
{"Quit", 0, 0, NULL, quit_cb, NULL},
{"SubMenu", 0, 0,
(struct tray_menu[]){
{"FIRST", 0, 1, NULL, submenu_cb, NULL},
{"SECOND", 0, 0,
(struct tray_menu[]){
{"THIRD", 0, 0,
(struct tray_menu[]){{"7", 0, 0, NULL, submenu_cb, NULL},
{"-", 0, 0, NULL, NULL, NULL},
{"8", 0, 0, NULL, submenu_cb, NULL},
{NULL, 0, 0, NULL, NULL, NULL}},
NULL, NULL},
{"FOUR", 0, 0,
(struct tray_menu[]){{"5", 0, 0, NULL, submenu_cb, NULL},
{"6", 0, 0, NULL, submenu_cb, NULL},
{NULL, 0, 0, NULL, NULL, NULL}},
NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}},
NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}},
NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}},
.menu =
(struct tray_menu[]){
{"Hello", 0, 0, hello_cb, NULL, NULL},
{"Checked", 0, 1, toggle_cb, NULL, NULL},
{"Disabled", 1, 0, NULL, NULL, NULL},
{"-", 0, 0, NULL, NULL, NULL},
{"Quit", 0, 0, quit_cb, NULL, NULL},
{"SubMenu", 0, 0, NULL, NULL,
(struct tray_menu[]){
{"FIRST", 0, 1, submenu_cb, NULL, NULL},
{"SECOND", 0, 0, NULL, NULL,
(struct tray_menu[]){
{"THIRD", 0, 0, NULL, NULL,
(struct tray_menu[]){{"7", 0, 0, submenu_cb, NULL, NULL},
{"-", 0, 0, NULL, NULL, NULL},
{"8", 0, 0, submenu_cb, NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}}},
{"FOUR", 0, 0, NULL, NULL,
(struct tray_menu[]){{"5", 0, 0, submenu_cb, NULL, NULL},
{"6", 0, 0, submenu_cb, NULL, NULL},
{NULL, 0, 0, NULL, NULL, NULL}}},
{NULL, 0, 0, NULL, NULL, NULL}}},
{NULL, 0, 0, NULL, NULL, NULL}}},
{NULL, 0, 0, NULL, NULL, NULL}},
};
int main() {
@@ -86,4 +83,4 @@ int main() {
printf("iteration\n");
}
return 0;
}
}