fix: subscreen buttonitem on active subscreen not scrolling properly

EmilyV99 · EmilyV99 · commit 5327d4c8e6ce · 2023-09-05T15:30:06.000-04:00
diff --git a/src/new_subscr.cpp b/src/new_subscr.cpp
@@ -1720,7 +1720,7 @@ byte SW_LifeMeter::getType() const
 }
 void SW_LifeMeter::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const
 {
-	lifemeter(dest, getX()+xofs, y+yofs, 1, flags&SUBSCR_LIFEMET_BOT);
+	lifemeter(dest, x+xofs, y+yofs, 1, flags&SUBSCR_LIFEMET_BOT);
 }
 SubscrWidget* SW_LifeMeter::clone() const
 {
@@ -1817,7 +1817,7 @@ void SW_ButtonItem::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& p
 				break;
 		}
 		if(dodraw)
-			putitem3(dest,x,y,btnitem_ids[btn]&0xFF,btnitem_clks[btn]);
+			putitem3(dest,x+xofs,y+yofs,btnitem_ids[btn]&0xFF,btnitem_clks[btn]);
 	}
 	
 	if(flags&SUBSCR_BTNITM_TRANSP)

Original file line number	Diff line number	Diff line change
`@@ -1720,7 +1720,7 @@ byte SW_LifeMeter::getType() const`
`1720`	`1720`	`}`
`1721`	`1721`	`void SW_LifeMeter::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& page) const`
`1722`	`1722`	`{`
`1723`		`- lifemeter(dest, getX()+xofs, y+yofs, 1, flags&SUBSCR_LIFEMET_BOT);`
	`1723`	`+ lifemeter(dest, x+xofs, y+yofs, 1, flags&SUBSCR_LIFEMET_BOT);`
`1724`	`1724`	`}`
`1725`	`1725`	`SubscrWidget* SW_LifeMeter::clone() const`
`1726`	`1726`	`{`
`@@ -1817,7 +1817,7 @@ void SW_ButtonItem::draw(BITMAP* dest, int32_t xofs, int32_t yofs, SubscrPage& p`
`1817`	`1817`	`break;`
`1818`	`1818`	`}`
`1819`	`1819`	`if(dodraw)`
`1820`		`- putitem3(dest,x,y,btnitem_ids[btn]&0xFF,btnitem_clks[btn]);`
	`1820`	`+ putitem3(dest,x+xofs,y+yofs,btnitem_ids[btn]&0xFF,btnitem_clks[btn]);`
`1821`	`1821`	`}`
`1822`	`1822`
`1823`	`1823`	`if(flags&SUBSCR_BTNITM_TRANSP)`