diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | doc/user_help.html | 5 | ||||
| -rw-r--r-- | src/IO/about.c | 4 | ||||
| -rw-r--r-- | src/cache.c | 5 | ||||
| -rw-r--r-- | src/styleengine.cc | 11 | ||||
| -rw-r--r-- | src/ui.cc | 8 |
6 files changed, 21 insertions, 16 deletions
@@ -12,7 +12,9 @@ dillo-3.0.3 [not released yet] +- Support for CSS display property Patch: Johannes Hofmann +- Fix image input coordinates (BUG#1070) - Patch: corvid + - When location bar is given focus, temporarily show panels if hidden + (BUG#1093). + Patches: corvid ----------------------------------------------------------------------------- diff --git a/doc/user_help.html b/doc/user_help.html index acf129f4..b8c3e580 100644 --- a/doc/user_help.html +++ b/doc/user_help.html @@ -121,9 +121,8 @@ <tr><td bgcolor="#70a0c0"> <p> - This one is very useful; - it can be found in the right-mouse-button menu<br> - Find text is tuned for speed so don't hesitate to use it even for minimal + This one is very useful; it can be found in the right-mouse-button menu. + Find text is tuned for speed, so don't hesitate to use it even for minimal searches. <p> <u>Semantics:</u> diff --git a/src/IO/about.c b/src/IO/about.c index 4ccd00e7..78cf086e 100644 --- a/src/IO/about.c +++ b/src/IO/about.c @@ -121,10 +121,6 @@ const char *const AboutSplash= " <tr>\n" " <td> \n" " <td>\n" -" <a href='http://www.linux.org.uk/Portaloo.cs'>Linux.org.uk</a>\n" -" <tr>\n" -" <td> \n" -" <td>\n" " <a href='http://www.commondreams.org/'>C. Dreams</a>\n" " <tr>\n" " <td> \n" diff --git a/src/cache.c b/src/cache.c index 11c7faf3..ea9d9a1f 100644 --- a/src/cache.c +++ b/src/cache.c @@ -15,6 +15,7 @@ #include <sys/types.h> +#include <limits.h> #include <stdlib.h> #include <string.h> @@ -142,7 +143,9 @@ static int Cache_client_enqueue(const DilloUrl *Url, DilloWeb *Web, static int ClientKey = 0; /* Provide a primary key for each client */ CacheClient_t *NewClient; - if (++ClientKey <= 0) + if (ClientKey < INT_MAX) /* check for integer overflow */ + ClientKey++; + else ClientKey = 1; NewClient = dNew(CacheClient_t, 1); diff --git a/src/styleengine.cc b/src/styleengine.cc index e94a6d6f..19b9f371 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -106,7 +106,7 @@ void StyleEngine::setId (const char *id) { DoctreeNode *dn = doctree->top (); assert (dn->id == NULL); dn->id = dStrdup (id); -}; +} /** * \brief split a string at sep chars and return a SimpleVector of strings @@ -137,7 +137,7 @@ void StyleEngine::setClass (const char *klass) { DoctreeNode *dn = doctree->top (); assert (dn->klass == NULL); dn->klass = splitStr (klass, ' '); -}; +} void StyleEngine::setStyle (const char *styleAttr) { Node *n = stack->getRef (stack->size () - 1); @@ -151,7 +151,7 @@ void StyleEngine::setStyle (const char *styleAttr) { n->styleAttrProperties, n->styleAttrPropertiesImportant); } -}; +} /** * \brief Instruct StyleEngine to use the nonCssHints from parent element @@ -838,6 +838,11 @@ void StyleEngine::buildUserAgentStyle () { "i, em, cite, address, var {font-style: italic}" ":link img, :visited img {border: 1px solid}" "frameset, ul, ol, dir {margin-left: 40px}" + /* WORKAROUND: It should be margin: 1em 0 + * but as we don't collapse these margins yet, it + * look better like this. + */ + "p {margin: 0.5em 0}" "h1 {font-size: 2em; margin-top: .67em; margin-bottom: 0}" "h2 {font-size: 1.5em; margin-top: .75em; margin-bottom: 0}" "h3 {font-size: 1.17em; margin-top: .83em; margin-bottom: 0}" @@ -739,10 +739,6 @@ int UI::handle(int event) a_UIcmd_search_dialog(a_UIcmd_get_bw_by_widget(this)); ret = 1; } else if (cmd == KEYS_GOTO) { - if (Panelmode == UI_HIDDEN) { - panels_toggle(); - temporaryPanels(true); - } focus_location(); ret = 1; } else if (cmd == KEYS_HIDE_PANELS) { @@ -819,6 +815,10 @@ void UI::set_location(const char *str) */ void UI::focus_location() { + if (Panelmode == UI_HIDDEN) { + panels_toggle(); + temporaryPanels(true); + } Location->take_focus(); // Make text selected when already focused. Location->position(Location->size(), 0); |