fix(select): menu label uses width from font

Author: pathway27

src/bkbookmark.cpp

@@ -37,6 +37,13 @@
 			<viewdata key="" value=""/>
 			...
 		</bookmark>
+		<bookmark ... >
+			<viewdata key="" value=""/>
+			<viewdata key="" value=""/>
+			<viewdata key="" value=""/>
+			<viewdata key="" value=""/>
+			...
+		</bookmark>
 	</file>
 	<lastfile filename=""/>
 </bookmarks>
@@ -66,7 +73,6 @@ static void clearXML() {
 	#else
 		snprintf(xmlfilename, 1024, BOOKMARK_XML_BASE, FZScreen::basePath().c_str(), BOOKMARK_XML);
 	#endif
-	
 
 	doc->SaveFile(xmlfilename);
 }
@@ -92,6 +98,7 @@ static void loadXML() {
 
 	if(doc->Error()) {
 		// probably file not found, create an empty one
+		printf("doc Error\n");
 		clearXML();
 	}
 
@@ -128,14 +135,27 @@ static void saveXML() {
 
 static XMLNode* fileNode(string& filename) {
 	#ifdef DEBUG
-		printf("fileNode\n");
+		printf("fileNode(%s)\n", filename.c_str());
 	#endif
 
+	#ifdef DEBUG
+		printf("fileNode - pre load xml\n");
+	#endif
 	if (doc == 0)
 		loadXML();
+
+	#ifdef DEBUG
+		printf("fileNode - post load xml\n");
+	#endif
 	XMLElement* file = root->FirstChildElement("file");
+	#ifdef DEBUG
+		printf("fileNode - file ass. xml\n");
+	#endif
 	while (file) {
 		const char* name = file->Attribute("filename");
+		#ifdef DEBUG
+			printf("fileNode - %s\n", name);
+		#endif
 		if (name != 0) {
 			if (strncmp(filename.c_str(), name, 1024) == 0)
 				return file;
@@ -258,6 +278,9 @@ static void addBookmarkProto(string& filename, BKBookmark& b, XMLNode* file) {
 	//bookmark->SetAttribute("zoomvalue", b.zoom);
 	//bookmark.SetAttribute("thumbnail", );
 	map<string, int>::iterator it(b.viewData.begin());
+	#ifdef DEBUG
+		printf("addBookmarkProto: title: %s page: %i\n", b.title.c_str(), b.page);
+	#endif
 	while (it != b.viewData.end()) {
 		XMLElement *vd = doc->NewElement("viewdata");
 		vd->SetAttribute("key", (*it).first.c_str());

src/bkdocument.cpp

@@ -278,6 +278,10 @@ int BKDocument::processEventsForView() {
 }
 
 void BKDocument::buildToolbarMenus() {
+  #ifdef DEBUG
+		printf("BKBookmarksManager::buildToolbarMenus\n");
+	#endif
+
   toolbarMenus[0].clear();
   if (isBookmarkable()) {
     ToolbarItem i("Add bookmark", "bk_add_bookmark_icon", "Select");
@@ -701,7 +705,7 @@ void BKDocument::render() {
     vita2d_draw_rectangle(
       60 + toolbarSelMenu*75 - 10,
       544 - 140 - (selItemI*55) - 55,
-      iw,
+      60 + 20 + iw,
       50,
       0xf0cccccc);
   #endif

src/bklayervita.cpp

@@ -170,7 +170,7 @@ int BKLayer::textWidthRange(char* t, int n, FZFont* font) {
 }
 
 int BKLayer::textW(char* t, FZFont* font) {
-  return 20 * strlen(t);
+  return font->fontTextWidth(t);
 }
 
 void BKLayer::drawTextHC(char* t, FZFont* font, int y) {
@@ -419,7 +419,7 @@ void BKLayer::drawPopup(string& text, string& title, int bg1, int bg2, int fg) {
 
 
 void BKLayer::drawClockAndBattery(string& extra) {
-  int ew = textW((char*)extra.c_str(), fontSmall);
+  // int ew = textW((char*)extra.c_str(), fontSmall);
   FZScreen::drawFontText(fontBig, DIALOG_MENU_ITEM_TEXT_OFFSET_X + 565,
     DIALOG_ICON_TEXT_OFFSET_Y - 45,
     DIALOG_ICON_COLOR, DIALOG_ICON_TEXT_SIZE, extra.c_str());

src/graphics/fzfont.h

@@ -79,6 +79,7 @@ class FZFont : public FZRefCounted {
   void doneUTFFont();
   static int get_next_utf8_char(unsigned long*, const char*, int);
   FZTexture* getTextureFromString(const char* t,int char_gap);
+  int fontTextWidth(const char *text);
 
   /**
    * Create a new font texture with Freetype.

src/graphics/fzfontvita.cpp

@@ -59,8 +59,17 @@ FZFont* FZFont::createFromMemory(unsigned char* buffer, int bufferSize) {
   #endif
   FZFont* font = new FZFont();
   font->v_font = vita2d_load_font_mem(buffer, bufferSize);
+  font->fontSize = 28;
   return font;
 }
+
+int FZFont::fontTextWidth(const char *text)
+{
+  #ifdef DEBUG
+    printf("FZFont::fontTextWidth() - %i\n", vita2d_font_text_width(v_font, fontSize, text));
+  #endif
+  return vita2d_font_text_width(v_font, fontSize, text);
+}
 #elif defined(SWITCH)
 FZFont::~FZFont() {
 }