X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.C;h=e2e1f972644e60fc7b60d8bc8030fe5a8c477ee8;hb=80d314adea22f450161d9b2afaaafe108ac988be;hp=5f0a047f9db5a8810d8616350e18237376dcf8df;hpb=3badd817d6f012b5e882940db0c5d7e61cec15d7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.C b/cinelerra-5.1/plugins/titler/titlerwindow.C
index 5f0a047f..e2e1f972 100644
--- a/cinelerra-5.1/plugins/titler/titlerwindow.C
+++ b/cinelerra-5.1/plugins/titler/titlerwindow.C
@@ -355,8 +355,7 @@ void TitleWindow::create_objects()
 	outline = new TitleOutline(client, this, x, y1);
 	outline->create_objects();
 	x += outline->get_w() + 2*margin;
-#ifdef USE_STOKER
-// to different to be used
+#ifdef USE_STROKER
 	add_tool(stroker_title = new BC_Title(x, y, _("Stroker:")));
 	stroker = new TitleStroker(client, this, x, y1);
 	stroker->create_objects();
@@ -690,7 +689,7 @@ void TitleWindow::update()
 	text->update(&client->config.wtext[0]);
 	speed->update(client->config.pixels_per_second);
 	outline->update((int64_t)client->config.outline_size);
-#ifdef USE_STOKER
+#ifdef USE_STROKER
 	stroker->update((int64_t)client->config.stroke_width);
 #endif
 	timecode->update(client->config.timecode);
@@ -1002,7 +1001,7 @@ void TitleWindow::check_style(const char *font_name, int update)
 	if( has_norm && has_bold ) bold->enable();   else bold->disable();
 	if( has_norm && has_ital ) italic->enable(); else italic->disable();
 	if( update ) {
-		int style = 0;
+		int style = stroker && atof(stroker->get_text()) ? BC_FONT_OUTLINE : 0;
 		if( bold->get_value() ) style |= BC_FONT_BOLD;
 		if( italic->get_value() ) style |= BC_FONT_ITALIC;
 		client->config.style = style;
@@ -1086,6 +1085,7 @@ int TitleOutline::handle_event()
 	return 1;
 }
 
+
 TitleStroker::TitleStroker(TitleMain *client, TitleWindow *window, int x, int y)
  : BC_TumbleTextBox(window, (int64_t)client->config.stroke_width,
 	(int64_t)0, (int64_t)1000, x, y, 70)
@@ -1095,8 +1095,8 @@ TitleStroker::TitleStroker(TitleMain *client, TitleWindow *window, int x, int y)
 }
 int TitleStroker::handle_event()
 {
-	client->config.stroke_width = atol(get_text());
-	if( client->config.stroke_width > 1 )
+	client->config.stroke_width = atof(get_text());
+	if( client->config.stroke_width )
 		client->config.style |= BC_FONT_OUTLINE;
 	else
 		client->config.style &= ~BC_FONT_OUTLINE;
@@ -1366,7 +1366,7 @@ int TitleCurPopup::handle_event()
 	return 1;
 }
 
-void TitleCurSubMenu::add_subitem(int popup_type, const char *fmt, va_list ap)
+void TitleCurSubMenu::add_subitem(int popup_type, va_list ap, const char *fmt)
 {
 	char item[BCSTRLEN];
 	vsnprintf(item, sizeof(item)-1, fmt, ap);
@@ -1385,7 +1385,7 @@ void TitleCurPopup::create_objects()
 	sub_menu->add_subitem("/%s",item);
 	add_item(cur_item = new TitleCurItem(this, item = KW_COLOR));
 	cur_item->add_submenu(sub_menu = new TitleCurSubMenu(cur_item));
-	sub_menu->add_subitem(POPUP_COLOR,"%s #",item);
+	sub_menu->add_subitem(POPUP_COLOR,"%s %s",item,_("#"));
 	sub_menu->add_subitem("%s ",item);
 	sub_menu->add_subitem("/%s",item);
 	add_item(cur_item = new TitleCurItem(this, item = KW_ALPHA));