Mercurial > dillo_port1.3
changeset 981:99e2a3ee8cd9
remove standard_widget_colors dillorc option
Form widgets by default use the background color of their
parent.
To get more conservative widget colors, you can add a line
button, select, input {background-color: #e0e0e0}
to ~/.dillo/style.css.
| author | corvid <corvid@lavabit.com> |
|---|---|
| date | Fri, 06 Mar 2009 09:31:29 +0100 |
| parents | 11c6f887d649 |
| children | d04d960da3f4 |
| files | ChangeLog dillorc src/form.cc src/prefs.c src/prefs.h |
| diffstat | 5 files changed, 5 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 05 14:43:11 2009 +0100 +++ b/ChangeLog Fri Mar 06 09:31:29 2009 +0100 @@ -34,6 +34,7 @@ - Implemented the "overline" text-decoration. - Enhanced and cleaned up text decorations for SUB and SUP. - Added "View Stylesheets" to the page menu. + - Remove standard_widget_colors dillorc option. Patches: place (AKA corvid) +- Switched SSL-enabled to configure.in (./configure --enable-ssl). - Standardised the installation of dpid/dpidrc with auto* tools.
--- a/dillorc Thu Mar 05 14:43:11 2009 +0100 +++ b/dillorc Fri Mar 06 09:31:29 2009 +0100 @@ -165,11 +165,6 @@ # to allow better contrast with text/links/background #contrast_visited_color=YES -# Colors for widgets inside forms. -# YES = toolkit's default colors, NO = use page's text and background color. -# ("NO" looks less traditional but more stylish). -#standard_widget_colors=NO - #------------------------------------------------------------------------- # USER INTERFACE SECTION
--- a/src/form.cc Thu Mar 05 14:43:11 2009 +0100 +++ b/src/form.cc Fri Mar 06 09:31:29 2009 +0100 @@ -542,14 +542,7 @@ // gtk_entry_set_max_length(GTK_ENTRY(widget), // strtol(attrbuf, NULL, 10)); } - Color *bg; - if (prefs.standard_widget_colors) - bg = NULL; - else - bg = Color::create (HT2LT(html), S_TOP(html)->current_bg_color); - HTML_SET_TOP_ATTR(html, backgroundColor, bg); - - DW2TB(html->dw)->addWidget (embed, html->styleEngine->style ()); + DW2TB(html->dw)->addWidget (embed, html->styleEngine->backgroundStyle()); } dFree(type); dFree(name); @@ -592,13 +585,7 @@ embed = new Embed (entryResource); Html_add_input(html, DILLO_HTML_INPUT_INDEX, embed, NULL, NULL, FALSE); - Color *bg; - if (prefs.standard_widget_colors) - bg = NULL; - else - bg = Color::create (HT2LT(html), S_TOP(html)->current_bg_color); - HTML_SET_TOP_ATTR(html, backgroundColor, bg); - DW2TB(html->dw)->addWidget (embed, html->styleEngine->style ()); + DW2TB(html->dw)->addWidget (embed, html->styleEngine->backgroundStyle ()); a_Url_free(action); html->InFlags &= ~IN_FORM; @@ -666,14 +653,7 @@ textres->setEditable(false); Html_add_input(html, DILLO_HTML_INPUT_TEXTAREA, embed, name, NULL, false); - Color *bg; - if (prefs.standard_widget_colors) - bg = NULL; - else - bg = Color::create (HT2LT(html), S_TOP(html)->current_bg_color); - HTML_SET_TOP_ATTR(html, backgroundColor, bg); - - DW2TB(html->dw)->addWidget (embed, html->styleEngine->style ()); + DW2TB(html->dw)->addWidget (embed, html->styleEngine->backgroundStyle ()); dFree(name); } @@ -757,17 +737,7 @@ } Embed *embed = new Embed(res); - int bg; - if (prefs.standard_widget_colors) { - /* Valid colors required; SELECT can contain other elements (BUG) */ - HTML_SET_TOP_ATTR(html, color, Color::createSimple (HT2LT(html), 0)); - bg = 0xffffff; - } else { - bg = S_TOP(html)->current_bg_color; - } - HTML_SET_TOP_ATTR(html, backgroundColor, - Color::createShaded (HT2LT(html), bg)); - DW2TB(html->dw)->addWidget (embed, html->styleEngine->style ()); + DW2TB(html->dw)->addWidget (embed, html->styleEngine->backgroundStyle ()); Html_add_input(html, type, embed, name, NULL, false); a_Html_stash_init(html);
--- a/src/prefs.c Thu Mar 05 14:43:11 2009 +0100 +++ b/src/prefs.c Fri Mar 06 09:31:29 2009 +0100 @@ -204,7 +204,6 @@ { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL }, { "show_url", &prefs.show_url, PREFS_BOOL }, { "small_icons", &prefs.small_icons, PREFS_BOOL }, - { "standard_widget_colors", &prefs.standard_widget_colors, PREFS_BOOL }, { "start_page", &prefs.start_page, PREFS_URL }, { "text_color", &prefs.text_color, PREFS_COLOR }, { "visited_color", &prefs.visited_color, PREFS_COLOR }, @@ -316,7 +315,6 @@ prefs.show_tooltip = TRUE; prefs.show_url=TRUE; prefs.small_icons = FALSE; - prefs.standard_widget_colors = FALSE; prefs.start_page = a_Url_new(DILLO_START_PAGE, NULL); prefs.text_color = DW_COLOR_DEFAULT_TEXT; prefs.visited_color = DW_COLOR_DEFAULT_VLINK;