changeset 2094:6cee904c7bb1

merge
author Jorge Arellano Cid <jcid@dillo.org>
date Tue, 14 Jun 2011 17:53:55 -0400
parents 9acbda95436f (current diff) 16cdda1f8379 (diff)
children 6dc9350d8193
files
diffstat 3 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/html.cc	Tue Jun 14 18:17:42 2011 +0000
+++ b/src/html.cc	Tue Jun 14 17:53:55 2011 -0400
@@ -2456,12 +2456,14 @@
          html->InVisitedLink = true;
          html->styleEngine->setPseudoVisited ();
          if (html->non_css_visited_color != -1)
-            html->styleEngine->setNonCssHint(CSS_PROPERTY_COLOR, CSS_TYPE_COLOR,
+            html->styleEngine->setNonCssHint(CSS_PROPERTY_COLOR,
+                                             CSS_TYPE_COLOR,
                                              html->non_css_visited_color);
       } else {
          html->styleEngine->setPseudoLink ();
          if (html->non_css_link_color != -1)
-            html->styleEngine->setNonCssHint(CSS_PROPERTY_COLOR, CSS_TYPE_COLOR,
+            html->styleEngine->setNonCssHint(CSS_PROPERTY_COLOR,
+                                             CSS_TYPE_COLOR,
                                              html->non_css_link_color);
       }
 
@@ -2739,9 +2741,11 @@
       html->styleEngine->setNonCssHint (CSS_PROPERTY_BORDER_LEFT_WIDTH,
                                         CSS_TYPE_LENGTH_PERCENTAGE, size_top);
       html->styleEngine->setNonCssHint (CSS_PROPERTY_BORDER_BOTTOM_WIDTH,
-                                        CSS_TYPE_LENGTH_PERCENTAGE, size_bottom);
+                                        CSS_TYPE_LENGTH_PERCENTAGE,
+                                        size_bottom);
       html->styleEngine->setNonCssHint (CSS_PROPERTY_BORDER_RIGHT_WIDTH,
-                                        CSS_TYPE_LENGTH_PERCENTAGE, size_bottom);
+                                        CSS_TYPE_LENGTH_PERCENTAGE,
+                                        size_bottom);
    }
 
    HT2TB(html)->addParbreak (5, html->styleEngine->wordStyle ());
--- a/src/uicmd.cc	Tue Jun 14 18:17:42 2011 +0000
+++ b/src/uicmd.cc	Tue Jun 14 17:53:55 2011 -0400
@@ -296,8 +296,8 @@
 
       // Update window title
       if ((bw = a_UIcmd_get_bw_by_widget(cbtn->ui()))) {
-         const char *title = a_History_get_title(NAV_TOP_UIDX(bw), 1);
-         a_UIcmd_set_page_title(bw, title ? title : "");
+         const char *title = (cbtn->ui())->label();
+         cbtn->window()->copy_label(title ? title : "");
       }
    }
 }
@@ -1157,6 +1157,7 @@
          uint_t i = MIN(size - 4, 1 + a_Utf8_end_of_char(title, size - 8));
          snprintf(title + i, 4, "...");
       }
+      BW2UI(bw)->copy_label(title);
       BW2UI(bw)->window()->copy_label(title);
    }
    BW2UI(bw)->tabs()->set_tab_label(BW2UI(bw), label);
--- a/src/web.cc	Tue Jun 14 18:17:42 2011 +0000
+++ b/src/web.cc	Tue Jun 14 17:53:55 2011 -0400
@@ -78,8 +78,11 @@
       /* This method frees the old dw if any */
       layout->setWidget(dw);
 
-      /* Clear the title bar for pages without a <TITLE> tag */
-      a_UIcmd_set_page_title(Web->bw, "");
+      /* Set the page title with the bare filename (e.g. for images),
+       * HTML pages with a <TITLE> tag will overwrite it later */
+      const char *p = strrchr(URL_STR(Web->url), '/');
+      a_UIcmd_set_page_title(Web->bw, p ? p+1 : "");
+
       a_UIcmd_set_location_text(Web->bw, URL_STR(Web->url));
       /* Reset both progress bars */
       a_UIcmd_set_page_prog(Web->bw, 0, 2);