Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d2534e0e74dc3bd9122263fd6e59cd3b185ffbb2
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d2534e0e74dc3bd9122263fd6e59cd3b185ffbb2
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d2534e0e74dc3bd9122263fd6e59cd3b185ffbb2
The branch, master has been updated
via d2534e0e74dc3bd9122263fd6e59cd3b185ffbb2 (commit)
via 9eba2716932484329c0b687b490e38f9c9c9337d (commit)
from 3f4bc9d284eaaba2bb1743328ebbffabfc34c25a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d2534e0e74dc3bd9122263fd6e59cd3b185ffbb2
commit d2534e0e74dc3bd9122263fd6e59cd3b185ffbb2
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Button disable state updates should now work correctly on OS3
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index eca5b92..d88c577 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1225,12 +1225,10 @@ static void ami_update_buttons(struct gui_window_2
*gwin)
}
}
-#ifdef __amigaos4__
GetAttr(GA_Disabled, gwin->objects[GID_BACK], (uint32 *)&s_back);
GetAttr(GA_Disabled, gwin->objects[GID_FORWARD], (uint32 *)&s_forward);
GetAttr(GA_Disabled, gwin->objects[GID_RELOAD], (uint32 *)&s_reload);
GetAttr(GA_Disabled, gwin->objects[GID_STOP], (uint32 *)&s_stop);
-#endif
if(BOOL_MISMATCH(s_back, back))
SetGadgetAttrs((struct Gadget *)gwin->objects[GID_BACK],
@@ -1250,9 +1248,9 @@ static void ami_update_buttons(struct gui_window_2 *gwin)
if(ClickTabBase->lib_Version < 53) {
if(gwin->tabs <= 1) tabclose = TRUE;
-#ifdef __amigaos4__
+
GetAttr(GA_Disabled, gwin->objects[GID_CLOSETAB], (uint32
*)&s_tabclose);
-#endif
+
if(BOOL_MISMATCH(s_tabclose, tabclose))
SetGadgetAttrs((struct Gadget
*)gwin->objects[GID_CLOSETAB],
gwin->win, NULL, GA_Disabled, tabclose,
TAG_DONE);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9eba2716932484329c0b687b490e38f9c9c9337d
commit 9eba2716932484329c0b687b490e38f9c9c9337d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
OS3 was not checking the GA_Disabled tag value
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 378bc04..645496b 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -405,9 +405,10 @@ ULONG RefreshSetGadgetAttrsA(struct Gadget *g, struct
Window *w, struct Requeste
ULONG retval;
BOOL changedisabled = FALSE;
BOOL disabled;
+ struct TagItem *ti;
if (w) {
- if (FindTagItem(GA_Disabled,tags)) {
+ if ((ti = FindTagItem(GA_Disabled,tags)) && (ti->ti_Data !=
FALSE)) {
changedisabled = TRUE;
disabled = g->Flags & GFLG_DISABLED;
}
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/gui.c | 6 ++----
frontends/amiga/os3support.c | 3 ++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index eca5b92..d88c577 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1225,12 +1225,10 @@ static void ami_update_buttons(struct gui_window_2
*gwin)
}
}
-#ifdef __amigaos4__
GetAttr(GA_Disabled, gwin->objects[GID_BACK], (uint32 *)&s_back);
GetAttr(GA_Disabled, gwin->objects[GID_FORWARD], (uint32 *)&s_forward);
GetAttr(GA_Disabled, gwin->objects[GID_RELOAD], (uint32 *)&s_reload);
GetAttr(GA_Disabled, gwin->objects[GID_STOP], (uint32 *)&s_stop);
-#endif
if(BOOL_MISMATCH(s_back, back))
SetGadgetAttrs((struct Gadget *)gwin->objects[GID_BACK],
@@ -1250,9 +1248,9 @@ static void ami_update_buttons(struct gui_window_2 *gwin)
if(ClickTabBase->lib_Version < 53) {
if(gwin->tabs <= 1) tabclose = TRUE;
-#ifdef __amigaos4__
+
GetAttr(GA_Disabled, gwin->objects[GID_CLOSETAB], (uint32
*)&s_tabclose);
-#endif
+
if(BOOL_MISMATCH(s_tabclose, tabclose))
SetGadgetAttrs((struct Gadget
*)gwin->objects[GID_CLOSETAB],
gwin->win, NULL, GA_Disabled, tabclose,
TAG_DONE);
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 378bc04..645496b 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -405,9 +405,10 @@ ULONG RefreshSetGadgetAttrsA(struct Gadget *g, struct
Window *w, struct Requeste
ULONG retval;
BOOL changedisabled = FALSE;
BOOL disabled;
+ struct TagItem *ti;
if (w) {
- if (FindTagItem(GA_Disabled,tags)) {
+ if ((ti = FindTagItem(GA_Disabled,tags)) && (ti->ti_Data !=
FALSE)) {
changedisabled = TRUE;
disabled = g->Flags & GFLG_DISABLED;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
