Changeset 46bd63c9 in mainline for uspace/lib/ui/private


Ignore:
Timestamp:
2023-09-08T08:47:30Z (2 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1af103e
Parents:
0b6fad9
git-author:
Jiri Svoboda <jiri@…> (2023-09-07 18:47:09)
git-committer:
Jiri Svoboda <jiri@…> (2023-09-08 08:47:30)
Message:

Split drop-down menu into two classes: drop-down and menu

Naming is clearly the hardest problem in computer science.

Location:
uspace/lib/ui/private
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/ui/private/menu.h

    r0b6fad9 r46bd63c9  
    11/*
    2  * Copyright (c) 2022 Jiri Svoboda
     2 * Copyright (c) 2023 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4141#include <gfx/coord.h>
    4242#include <stdbool.h>
     43#include <types/common.h>
    4344#include <types/ui/menu.h>
    4445#include <types/ui/resource.h>
    … …  
    4950 */
    5051struct ui_menu {
    51         /** Containing menu bar */
    52         struct ui_menu_bar *mbar;
    53         /** Link to @c bar->menus */
    54         link_t lmenus;
     52        /** Parent window */
     53        struct ui_window *parent;
    5554        /** Caption */
    5655        char *caption;
    … …  
    6766        /** Menu entries (ui_menu_entry_t) */
    6867        list_t entries;
     68        /** Callbacks */
     69        struct ui_menu_cb *cb;
     70        /** Callback argument */
     71        void *arg;
    6972};
    7073
    … …  
    8689extern void ui_menu_up(ui_menu_t *);
    8790extern void ui_menu_down(ui_menu_t *);
     91extern void ui_menu_left(ui_menu_t *, sysarg_t);
     92extern void ui_menu_right(ui_menu_t *, sysarg_t);
     93extern void ui_menu_close_req(ui_menu_t *);
     94extern void ui_menu_press_accel(ui_menu_t *, char32_t, sysarg_t);
    8895
    8996#endif

  • uspace/lib/ui/private/menubar.h

    r0b6fad9 r46bd63c9  
    4242#include <stdbool.h>
    4343#include <types/common.h>
    44 #include <types/ui/menu.h>
    4544#include <types/ui/menubar.h>
     45#include <types/ui/menudd.h>
    4646
    4747/** Actual structure of menu bar.
    … …  
    6060        /** Menu bar is active */
    6161        bool active;
    62         /** Selected menu or @c NULL */
    63         struct ui_menu *selected;
    64         /** List of menus (ui_menu_t) */
    65         list_t menus;
     62        /** Selected menu drop-down or @c NULL */
     63        struct ui_menu_dd *selected;
     64        /** List of menu drop-downs (ui_menu_dd_t) */
     65        list_t menudds;
    6666};
    6767
    68 extern void ui_menu_bar_select(ui_menu_bar_t *, ui_menu_t *, bool, sysarg_t);
     68extern void ui_menu_bar_select(ui_menu_bar_t *, ui_menu_dd_t *, bool, sysarg_t);
    6969extern void ui_menu_bar_left(ui_menu_bar_t *, sysarg_t);
    7070extern void ui_menu_bar_right(ui_menu_bar_t *, sysarg_t);
    7171extern ui_evclaim_t ui_menu_bar_key_press_unmod(ui_menu_bar_t *, kbd_event_t *);
    72 extern void ui_menu_bar_entry_rect(ui_menu_bar_t *, ui_menu_t *, gfx_rect_t *);
     72extern void ui_menu_bar_entry_rect(ui_menu_bar_t *, ui_menu_dd_t *,
     73    gfx_rect_t *);
    7374
    7475#endif
Note: See TracChangeset for help on using the changeset viewer.