From 17383c2691bfb121388c539bebe8b32bb97e4e9b Mon Sep 17 00:00:00 2001
From: Yoshihisa Uchida <uchida@rockbox.org>
Date: Sat, 26 Jun 2010 12:17:01 +0000
Subject: text viewer: some modify text viewer's layout and preferences. -
 layout: hader, footer and horizontal_scrollbar add padding. - add member
 'statusbar' in tv_preferences. - delete HD_SBAR/HD_BOTH/FT_SBAR/FT_BOTH. -
 deletes the function to check header_mode/footer_mode.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27142 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/text_viewer/tv_window.c | 44 ++----------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

(limited to 'apps/plugins/text_viewer/tv_window.c')

diff --git a/apps/plugins/text_viewer/tv_window.c b/apps/plugins/text_viewer/tv_window.c
index df3951aa28..16be8845ef 100644
--- a/apps/plugins/text_viewer/tv_window.c
+++ b/apps/plugins/text_viewer/tv_window.c
@@ -52,40 +52,6 @@ static bool tv_set_font(const unsigned char *font)
     }
     return true;
 }
-
-static bool tv_check_header_and_footer(struct tv_preferences *new_prefs)
-{
-    bool change_prefs = false;
-
-    if (rb->global_settings->statusbar != STATUSBAR_TOP)
-    {
-        if (new_prefs->header_mode == HD_SBAR)
-        {
-            new_prefs->header_mode = HD_NONE;
-            change_prefs = true;
-        }
-        else if (new_prefs->header_mode == HD_BOTH)
-        {
-            new_prefs->header_mode = HD_PATH;
-            change_prefs = true;
-        }
-    }
-    if (rb->global_settings->statusbar != STATUSBAR_BOTTOM)
-    {
-        if (new_prefs->footer_mode == FT_SBAR)
-        {
-            new_prefs->footer_mode = FT_NONE;
-            change_prefs = true;
-        }
-        else if (new_prefs->footer_mode == FT_BOTH)
-        {
-            new_prefs->footer_mode = FT_PAGE;
-            change_prefs = true;
-        }
-    }
-
-    return change_prefs;
-}
 #endif
 
 static void tv_show_bookmarks(const struct tv_screen_pos *top_pos)
@@ -177,7 +143,6 @@ static void tv_change_preferences(const struct tv_preferences *oldp)
 #else
     static bool font_changing = false;
     const unsigned char *font_str;
-    bool change_prefs = false;
     bool need_vertical_scrollbar;
     struct tv_preferences new_prefs;
     tv_copy_preferences(&new_prefs);
@@ -191,16 +156,11 @@ static void tv_change_preferences(const struct tv_preferences *oldp)
         if (!tv_set_font(preferences->font_name))
         {
             rb->strlcpy(new_prefs.font_name, font_str, MAX_PATH);
-            change_prefs = true;
+            tv_set_preferences(&new_prefs);
+            return;
         }
     }
 
-    if (tv_check_header_and_footer(&new_prefs) || change_prefs)
-    {
-        tv_set_preferences(&new_prefs);
-        return;
-    }
-
     font_changing = false;
 #endif
 
-- 
cgit v1.2.3