Sidebar for previous bits now uses correct math.

This commit is contained in:
Justin Marshall
2020-06-03 19:56:42 -07:00
parent be480a28a9
commit 2a5867f872
2 changed files with 36 additions and 34 deletions
+10 -10
View File
@@ -49,16 +49,16 @@ class SidebarClass: public PowerClass
** as enumerations since C++ cannot use "const" in this context.
*/
enum SideBarClassEnums {
BUTTON_ACTIVATOR=100, // Button ID for the activator.
SIDE_X=640-80, // The X position of sidebar upper left corner.
SIDE_Y=7+70, // The Y position of sidebar upper left corner.
SIDE_WIDTH=SIDEBAR_WID, // Width of the entire sidebar (in pixels).
SIDE_HEIGHT=200-(7+70), // Height of the entire sidebar (in pixels).
TOP_HEIGHT=13, // Height of top section (with repair/sell buttons).
COLUMN_ONE_X=(510-80)+8, // Sidestrip upper left coordinates...
COLUMN_ONE_Y=int(SIDE_Y)+int(TOP_HEIGHT),
COLUMN_TWO_X=(510-80)+8+((80-16)/2)+3,
COLUMN_TWO_Y=7+70+13,
BUTTON_ACTIVATOR = 100, // Button ID for the activator.
SIDE_X = 320 - 80, // The X position of sidebar upper left corner.
SIDE_Y = 7 + 70, // The Y position of sidebar upper left corner.
SIDE_WIDTH = SIDEBAR_WID, // Width of the entire sidebar (in pixels).
SIDE_HEIGHT = 200 - (7 + 70), // Height of the entire sidebar (in pixels).
TOP_HEIGHT = 13, // Height of top section (with repair/sell buttons).
COLUMN_ONE_X = (320 - 80) + 8, // Sidestrip upper left coordinates...
COLUMN_ONE_Y = int(SIDE_Y) + int(TOP_HEIGHT),
COLUMN_TWO_X = (320 - 80) + 8 + ((80 - 16) / 2) + 3,
COLUMN_TWO_Y = 7 + 70 + 13,
//BGA: changes to all buttons
#ifdef GERMAN