Commits

Trammell Hudson committed 1913f76

Switch to light font and move time to upper right

  • Participants
  • Parent commits 63fbbeb

Comments (0)

Files changed (2)

File worldmap/src/Makefile

 SRCS += worldmap.c
 
 FONTS := \
-	fonts/SourceCodePro-Black.otf:18 \
+	fonts/SourceCodePro-Light.otf:18 \
 
 IMAGES := \
 	images/map.png:white \

File worldmap/src/worldmap.c

 text_layer(
 	TextLayer * layer,
 	GRect frame,
-	int font
+	GFont font
 )
 {
 	text_layer_init(layer, frame);
 	text_layer_set_text(layer, "");
+#if 0
+	// white bg to help with layout
 	text_layer_set_text_color(layer, GColorBlack);
 	text_layer_set_background_color(layer, GColorWhite);
-	text_layer_set_font(layer, fonts_load_custom_font(resource_get_handle(font)));
+#else
+	// black bg for real
+	text_layer_set_text_color(layer, GColorWhite);
+	text_layer_set_background_color(layer, GColorBlack);
+#endif
+
+	text_layer_set_font(layer, font);
 
 	layer_add_child(&window.layer, &layer->layer);
 }
 
 	layer_add_child(&window.layer, &map_container.layer.layer);
 
+	GFont font = fonts_load_custom_font(resource_get_handle(
+		RESOURCE_ID_FONT_SOURCECODEPRO_LIGHT_18));
+
 	text_layer(
 		&time_layer,
-		GRect(0, 150, 60, 30),
-		RESOURCE_ID_FONT_SOURCECODEPRO_BLACK_18
+		GRect(90, -6, 60, 20),
+		font
 	);
 }
 
 	AppContextRef ctx
 )
 {
+	(void) ctx;
+
 	rotbmp_pair_deinit_container(&map_container);
 }