X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fplugintoolbar.cpp;h=25ff2cd49fc8fbd7ee714e8931bcc99e11cf9aa7;hb=578b01e8cb2bf425c24cbeee3bbb6a5f7c59b1cb;hp=32b31c5a382ba753b2999f2ed70cdd0111854d93;hpb=1ce2d1a4685918788e3f22c8f26f652e474da6c0;p=xonotic%2Fnetradiant.git

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index 32b31c5a..25ff2cd4 100644
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -42,13 +42,13 @@ ui::Image new_plugin_image( const char* filename ){
 
 	{
 		StringOutputStream fullpath( 256 );
-		fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename;
+		fullpath << DataPath_get() << g_pluginsDir << "bitmaps/" << filename;
 		if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
 	}
 
 	{
 		StringOutputStream fullpath( 256 );
-		fullpath << AppPath_get() << g_modulesDir << "bitmaps/" << filename;
+		fullpath << DataPath_get() << g_modulesDir << "bitmaps/" << filename;
 		if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
 	}
 
@@ -57,22 +57,31 @@ ui::Image new_plugin_image( const char* filename ){
 
 void toolbar_insert( ui::Toolbar toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GCallback handler, gpointer data ){
 	if (type == IToolbarButton::eSpace) {
-		auto it = ui::Widget(GTK_WIDGET(gtk_separator_tool_item_new()));
+		auto it = ui::ToolItem::from(gtk_separator_tool_item_new());
 		it.show();
 		toolbar.add(it);
 		return;
 	}
+	#define GARUX_DISABLE_SPACER_NOFOCUS
+	#ifndef GARUX_DISABLE_SPACER_NOFOCUS
+	else {
+		GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_FOCUS );
+		GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_DEFAULT );
+	}
+	#endif // GARUX_DISABLE_SPACER_NOFOCUS
+
 	if (type == IToolbarButton::eButton) {
-		auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_tool_button_new(GTK_WIDGET(new_plugin_image(icon)), text)));
+		auto button = ui::ToolButton::from(gtk_tool_button_new(new_plugin_image(icon), text));
 		gtk_widget_set_tooltip_text(button, tooltip);
 		gtk_widget_show_all(button);
 		button.connect("clicked", G_CALLBACK(handler), data);
 		toolbar.add(button);
 		return;
 	}
+
 	if (type == IToolbarButton::eToggleButton) {
-		auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_toggle_tool_button_new()));
-		gtk_tool_button_set_icon_widget(button, GTK_WIDGET(new_plugin_image(icon)));
+		auto button = ui::ToolButton::from(gtk_toggle_tool_button_new());
+		gtk_tool_button_set_icon_widget(button, new_plugin_image(icon));
 		gtk_tool_button_set_label(button, text);
 		gtk_widget_set_tooltip_text(button, tooltip);
 		gtk_widget_show_all(button);
@@ -80,10 +89,11 @@ void toolbar_insert( ui::Toolbar toolbar, const char* icon, const char* text, co
 		toolbar.add(button);
 		return;
 	}
+
 	ERROR_MESSAGE( "invalid toolbar button type" );
 }
 
-void ActivateToolbarButton( GtkToolButton *widget, gpointer data ){
+void ActivateToolbarButton( ui::ToolButton widget, gpointer data ){
 	(const_cast<const IToolbarButton *>( reinterpret_cast<IToolbarButton *>( data )))->activate();
 }
 
@@ -120,7 +130,7 @@ void PluginToolbar_clear(){
 
 ui::Toolbar create_plugin_toolbar(){
 
-	auto toolbar = ui::Toolbar(GTK_TOOLBAR( gtk_toolbar_new() ));
+	auto toolbar = ui::Toolbar::from( gtk_toolbar_new() );
 	gtk_orientable_set_orientation( GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL );
 	gtk_toolbar_set_style( toolbar, GTK_TOOLBAR_ICONS );
 	toolbar.show();