aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcorvid <corvid@dillo.org>2013-09-14 15:26:13 +0000
committercorvid <corvid@dillo.org>2013-09-14 15:26:13 +0000
commit0ab4edb3001ca79c51be6f050e7e8f92ff823410 (patch)
tree5a3a9d065b82f319506546fecee0e347ee2100cf /src
parente66d434aeb97c78daf0d6c3b8e7de0b157310635 (diff)
BUG#1140: add show_ui_tooltip preference
Diffstat (limited to 'src')
-rw-r--r--src/dillo.cc3
-rw-r--r--src/prefs.c1
-rw-r--r--src/prefs.h1
-rw-r--r--src/prefsparser.cc1
-rw-r--r--src/tipwin.cc2
5 files changed, 5 insertions, 3 deletions
diff --git a/src/dillo.cc b/src/dillo.cc
index 567d897f..6a7747ed 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -489,8 +489,7 @@ int main(int argc, char **argv)
Fl::scheme(prefs.theme);
setColors();
- if (!prefs.show_tooltip) {
- // turn off UI tooltips
+ if (!prefs.show_ui_tooltip) {
Fl::option(Fl::OPTION_SHOW_TOOLTIPS, false);
}
diff --git a/src/prefs.c b/src/prefs.c
index 4ab476c8..98406034 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -97,6 +97,7 @@ void a_Prefs_init(void)
prefs.show_stop = TRUE;
prefs.show_tools = TRUE;
prefs.show_tooltip = TRUE;
+ prefs.show_ui_tooltip = TRUE;
prefs.small_icons = FALSE;
prefs.start_page = a_Url_new(PREFS_START_PAGE, NULL);
prefs.theme = dStrdup(PREFS_THEME);
diff --git a/src/prefs.h b/src/prefs.h
index 941c0b51..f0cfce48 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -61,6 +61,7 @@ typedef struct {
int32_t ui_text_bg_color;
bool_t contrast_visited_color;
bool_t show_tooltip;
+ bool_t show_ui_tooltip;
char *theme;
int panel_size;
bool_t small_icons;
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index dde562b3..a2de1cfa 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -107,6 +107,7 @@ int PrefsParser::parseOption(char *name, char *value)
{ "show_stop", &prefs.show_stop, PREFS_BOOL },
{ "show_tools", &prefs.show_tools, PREFS_BOOL },
{ "show_tooltip", &prefs.show_tooltip, PREFS_BOOL },
+ { "show_ui_tooltip", &prefs.show_ui_tooltip, PREFS_BOOL },
{ "small_icons", &prefs.small_icons, PREFS_BOOL },
{ "start_page", &prefs.start_page, PREFS_URL },
{ "theme", &prefs.theme, PREFS_STRING },
diff --git a/src/tipwin.cc b/src/tipwin.cc
index c8463eb5..01d9a2f4 100644
--- a/src/tipwin.cc
+++ b/src/tipwin.cc
@@ -71,7 +71,7 @@ void TipWin::value(const char *s) {
void TipWin::do_show(void *wid) {
cur_widget = wid; // Keep track of requesting widget
- if (prefs.show_tooltip) {
+ if (prefs.show_ui_tooltip) {
Fl::add_timeout(recent ? 0.2f : 0.8f, show_timeout);
}
}