mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-20 11:12:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix toolbar customisation

Browse Source
This commit is contained in:
Vincent Sanders 2019-09-21 01:34:40 +01:00 committed by Daniel Silverstone
parent 9d3112a643
commit 9dd936ae7c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontends/gtk/toolbar.c
View File

@ -524,14 +524,19 @@ make_toolbar_item(nsgtk_toolbar_button itemid, bool sensitivity)
* \return gtk tool item widget * \return gtk tool item widget
*/ */
static GtkToolItem * static GtkToolItem *
make_toolbox_item(nsgtk_toolbar_button itemid) make_toolbox_item(nsgtk_toolbar_button itemid, bool bar)
{ {
GtkToolItem *toolitem = NULL; GtkToolItem *toolitem = NULL;
switch(itemid) { switch(itemid) {
#define TOOLBAR_ITEM_y(identifier, label, iconame) #define TOOLBAR_ITEM_y(identifier, label, iconame)
#define TOOLBAR_ITEM_n(identifier, label, iconame) #define TOOLBAR_ITEM_n(identifier, label, iconame)
#define TOOLBAR_ITEM_t(identifier, label, iconame) #define TOOLBAR_ITEM_t(identifier, label, iconame) \
case identifier: \
if (bar) { \
toolitem = make_toolbar_item_button(#label, iconame, true, true); \
} \
break;
#define TOOLBAR_ITEM_b(identifier, label, iconame) \ #define TOOLBAR_ITEM_b(identifier, label, iconame) \
case identifier: \ case identifier: \
toolitem = make_toolbar_item_button(#label, iconame, true, true); \ toolitem = make_toolbar_item_button(#label, iconame, true, true); \
@ -811,7 +816,7 @@ customisation_toolbar_drag_drop_cb(GtkWidget *widget,
} }
dragitem->button = make_toolbox_item(tbc->dragitem); dragitem->button = make_toolbox_item(tbc->dragitem, true);
if (dragitem->button == NULL) { if (dragitem->button == NULL) {
nsgtk_warning("NoMemory", 0); nsgtk_warning("NoMemory", 0);
@ -978,7 +983,8 @@ apply_user_button_customisation(struct nsgtk_toolbar *tb)
} }
for (iidx = BACK_BUTTON; iidx < PLACEHOLDER_BUTTON; iidx++) { for (iidx = BACK_BUTTON; iidx < PLACEHOLDER_BUTTON; iidx++) {
if (strncmp(tb->items[iidx].name, start, end - start) == 0) { if (((ssize_t)strlen(tb->items[iidx].name) == (end - start)) &&
(strncmp(tb->items[iidx].name, start, end - start) == 0)) {
tb->items[iidx].location = location++; tb->items[iidx].location = location++;
break; break;
} }
@ -1038,12 +1044,12 @@ static nserror populate_gtk_toolbar_widget(struct nsgtk_toolbar *tb)
if (itemid == PLACEHOLDER_BUTTON) { if (itemid == PLACEHOLDER_BUTTON) {
break; break;
} }
tb->items[location].button = tb->items[itemid].button =
make_toolbar_item(location, make_toolbar_item(itemid,
tb->items[location].sensitivity); tb->items[itemid].sensitivity);
gtk_toolbar_insert(tb->widget, gtk_toolbar_insert(tb->widget,
tb->items[location].button, tb->items[itemid].button,
location); location);
} }
@ -1075,10 +1081,10 @@ static nserror customisation_toolbar_populate(struct nsgtk_toolbar *tb)
if (itemid == PLACEHOLDER_BUTTON) { if (itemid == PLACEHOLDER_BUTTON) {
break; break;
} }
tb->items[location].button = make_toolbox_item(location); tb->items[itemid].button = make_toolbox_item(itemid, true);
gtk_toolbar_insert(tb->widget, gtk_toolbar_insert(tb->widget,
tb->items[location].button, tb->items[itemid].button,
location); location);
} }
@ -1423,7 +1429,7 @@ toolbar_customisation_create_toolbox(struct nsgtk_toolbar_customisation *tbc,
curcol = 0; curcol = 0;
startidx = iidx; startidx = iidx;
} }
tbc->items[iidx] = make_toolbox_item(iidx); tbc->items[iidx] = make_toolbox_item(iidx, false);
if (tbc->items[iidx] != NULL) { if (tbc->items[iidx] != NULL) {
curcol++; curcol++;
} }