1 files changed, 6 insertions, 24 deletions

diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c
index c6fe40cdb7..ffc78bd53a 100644
--- a/firmware/drivers/lcd-1bit-vert.c
+++ b/firmware/drivers/lcd-1bit-vert.c
@@ -56,8 +56,6 @@ static struct viewport default_vp =
     .height   = LCDM(HEIGHT),
     .font     = FONT_SYSFIXED,
     .drawmode = DRMODE_SOLID,
-    .xmargin  = 0,
-    .ymargin  = 0,
 };
 
 static struct viewport* current_vp = &default_vp;
@@ -107,22 +105,6 @@ int LCDFN(get_drawmode)(void)
     return current_vp->drawmode;
 }
 
-void LCDFN(setmargins)(int x, int y)
-{
-    current_vp->xmargin = x;
-    current_vp->ymargin = y;
-}
-
-int LCDFN(getxmargin)(void)
-{
-    return current_vp->xmargin;
-}
-
-int LCDFN(getymargin)(void)
-{
-    return current_vp->ymargin;
-}
-
 int LCDFN(getwidth)(void)
 {
     return current_vp->width;
@@ -760,8 +742,8 @@ void LCDFN(puts_style_offset)(int x, int y, const unsigned char *str,
         return;
 
     LCDFN(getstringsize)(str, &w, &h);
-    xpos = current_vp->xmargin + x*w / utf8length(str);
-    ypos = current_vp->ymargin + y*h;
+    xpos = x*w / utf8length(str);
+    ypos = y*h;
     current_vp->drawmode = (style & STYLE_INVERT) ?
                            (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID;
     LCDFN(putsxyofs)(xpos, ypos, offset, str);
@@ -816,7 +798,7 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
 
     LCDFN(getstringsize)(string, &w, &h);
 
-    if (current_vp->width - x * 8 - current_vp->xmargin < w) {
+    if (current_vp->width - x * 8 < w) {
         /* prepare scroll line */
         char *end;
 
@@ -829,7 +811,7 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
         /* scroll bidirectional or forward only depending on the string
            width */
         if ( LCDFN(scroll_info).bidir_limit ) {
-            s->bidir = s->width < (current_vp->width - current_vp->xmargin) *
+            s->bidir = s->width < (current_vp->width) *
                 (100 + LCDFN(scroll_info).bidir_limit) / 100;
         }
         else
@@ -848,7 +830,7 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
         s->y = y;
         s->len = utf8length(string);
         s->offset = offset;
-        s->startx = current_vp->xmargin + x * s->width / s->len;;
+        s->startx = x * s->width / s->len;;
         s->backward = false;
 
         LCDFN(scroll_info).lines++;
@@ -880,7 +862,7 @@ void LCDFN(scroll_fn)(void)
 
         pf = font_get(current_vp->font);
         xpos = s->startx;
-        ypos = current_vp->ymargin + s->y * pf->height;
+        ypos = s->y * pf->height;
 
         if (s->bidir) { /* scroll bidirectional */
             if (s->offset <= 0) {