X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.C;h=ba67eeffd1da6d7d5ab37a6d34ed3f6038d9d453;hb=9dc94ff0a716a04cdec4ef2466ed20227b79c114;hp=7f803ec03e4c4b15beddafc7e4419ca97c2bc4b2;hpb=331564c0ebb30688da917fc1c89058e12771e348;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C
index 7f803ec0..ba67eeff 100644
--- a/cinelerra-5.1/guicast/bcresources.C
+++ b/cinelerra-5.1/guicast/bcresources.C
@@ -234,10 +234,11 @@ BC_Resources::BC_Resources()
 	wide_encoding = little_endian ?  "UTF32LE" : "UTF32BE";
 	use_xvideo = 1;
 
-#include "images/file_film_png.h"
 #include "images/file_folder_png.h"
-#include "images/file_sound_png.h"
 #include "images/file_unknown_png.h"
+#include "images/file_film_png.h"
+#include "images/file_sound_png.h"
+#include "images/file_label_png.h"
 #include "images/file_column_png.h"
 	static VFrame* default_type_to_icon[] =
 	{
@@ -245,6 +246,7 @@ BC_Resources::BC_Resources()
 		new VFramePng(file_unknown_png),
 		new VFramePng(file_film_png),
 		new VFramePng(file_sound_png),
+		new VFramePng(file_label_png),
 		new VFramePng(file_column_png)
 	};
 	type_to_icon = default_type_to_icon;
@@ -968,25 +970,25 @@ int BC_Resources::init_fontconfig(const char *search_path)
 		}
 
 		if(!strcasecmp(entry->swidth, "normal"))
-			entry->style = FL_WIDTH_NORMAL;
+			entry->style |= FL_WIDTH_NORMAL;
 		else if(!strcasecmp(entry->swidth, "ultracondensed"))
-			entry->style = FL_WIDTH_ULTRACONDENSED;
+			entry->style |= FL_WIDTH_ULTRACONDENSED;
 		else if(!strcasecmp(entry->swidth, "extracondensed"))
-			entry->style = FL_WIDTH_EXTRACONDENSED;
+			entry->style |= FL_WIDTH_EXTRACONDENSED;
 		else if(!strcasecmp(entry->swidth, "condensed"))
-			entry->style = FL_WIDTH_CONDENSED;
+			entry->style |= FL_WIDTH_CONDENSED;
 		else if(!strcasecmp(entry->swidth, "semicondensed"))
-			entry->style = FL_WIDTH_SEMICONDENSED;
+			entry->style |= FL_WIDTH_SEMICONDENSED;
 		else if(!strcasecmp(entry->swidth, "semiexpanded"))
-			entry->style = FL_WIDTH_SEMIEXPANDED;
+			entry->style |= FL_WIDTH_SEMIEXPANDED;
 		else if(!strcasecmp(entry->swidth, "expanded"))
-			entry->style = FL_WIDTH_EXPANDED;
+			entry->style |= FL_WIDTH_EXPANDED;
 		else if(!strcasecmp(entry->swidth, "extraexpanded"))
-			entry->style = FL_WIDTH_EXTRAEXPANDED;
+			entry->style |= FL_WIDTH_EXTRAEXPANDED;
 		else if(!strcasecmp(entry->swidth, "ultraexpanded"))
-			entry->style = FL_WIDTH_ULTRAEXPANDED;
+			entry->style |= FL_WIDTH_ULTRAEXPANDED;
 		else
-			entry->style = FL_WIDTH_NORMAL;
+			entry->style |= FL_WIDTH_NORMAL;
 
 		fontlist->append(entry);
 //		printf("TitleMain::build_fonts %s: success\n",	entry->path);
@@ -1440,7 +1442,7 @@ BC_FontEntry *BC_Resources::find_fontentry(const char *displayname, int style,
 			{
 				if(!style_match)
 					style_match = entry;
-				if(!preferred_match && (entry->style & preferred))
+				if(!preferred_match && entry->fixed_style == preferred)
 					preferred_match = entry;
 			}
 		}