X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=libs%2Fgtkutil%2Ftoolbar.cpp;fp=libs%2Fgtkutil%2Ftoolbar.cpp;h=fa7cc4f49df52a7475df5f0d0cbf820e11b0fafa;hp=049d05ec1fc62fd4684ecb79661fb54077a70551;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hpb=0a6d5683b0cfa1a0bd7ef64bada105dbe4ddd6e1

diff --git a/libs/gtkutil/toolbar.cpp b/libs/gtkutil/toolbar.cpp
index 049d05ec..fa7cc4f4 100644
--- a/libs/gtkutil/toolbar.cpp
+++ b/libs/gtkutil/toolbar.cpp
@@ -31,39 +31,49 @@
 #include "image.h"
 
 
-void toolbar_append( ui::Toolbar toolbar, ui::ToolItem button, const char* description ){
-	gtk_widget_show_all(button);
-	gtk_widget_set_tooltip_text(button, description);
-	toolbar.add(button);
+void toolbar_append(ui::Toolbar toolbar, ui::ToolItem button, const char *description)
+{
+    gtk_widget_show_all(button);
+    gtk_widget_set_tooltip_text(button, description);
+    toolbar.add(button);
 }
 
-ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& callback ){
-	auto button = ui::ToolButton::from(gtk_tool_button_new(new_local_image(icon), nullptr));
-	button_connect_callback(button, callback);
-	toolbar_append(toolbar, button, description);
-	return button;
+ui::ToolButton
+toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const Callback<void()> &callback)
+{
+    auto button = ui::ToolButton::from(gtk_tool_button_new(new_local_image(icon), nullptr));
+    button_connect_callback(button, callback);
+    toolbar_append(toolbar, button, description);
+    return button;
 }
 
-ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const Callback<void()>& callback ){
-	auto button = ui::ToggleToolButton::from(gtk_toggle_tool_button_new());
-	toggle_button_connect_callback(button, callback);
-	gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), new_local_image(icon));
-	gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), description);
-	toolbar_append(toolbar, button, description);
-	return button;
+ui::ToggleToolButton toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon,
+                                                  const Callback<void()> &callback)
+{
+    auto button = ui::ToggleToolButton::from(gtk_toggle_tool_button_new());
+    toggle_button_connect_callback(button, callback);
+    gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), new_local_image(icon));
+    gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), description);
+    toolbar_append(toolbar, button, description);
+    return button;
 }
 
-ui::ToolButton toolbar_append_button( ui::Toolbar toolbar, const char* description, const char* icon, const Command& command ){
-	return toolbar_append_button( toolbar, description, icon, command.m_callback );
+ui::ToolButton
+toolbar_append_button(ui::Toolbar toolbar, const char *description, const char *icon, const Command &command)
+{
+    return toolbar_append_button(toolbar, description, icon, command.m_callback);
 }
 
-void toggle_button_set_active_callback(void *it, bool active ){
-	auto button = ui::ToggleToolButton::from(it);
-	toggle_button_set_active_no_signal( button, active );
+void toggle_button_set_active_callback(void *it, bool active)
+{
+    auto button = ui::ToggleToolButton::from(it);
+    toggle_button_set_active_no_signal(button, active);
 }
 
-ui::ToggleToolButton toolbar_append_toggle_button( ui::Toolbar toolbar, const char* description, const char* icon, const Toggle& toggle ){
-	auto button = toolbar_append_toggle_button( toolbar, description, icon, toggle.m_command.m_callback );
-	toggle.m_exportCallback( PointerCaller<void, void(bool), toggle_button_set_active_callback>( button._handle ) );
-	return button;
+ui::ToggleToolButton
+toolbar_append_toggle_button(ui::Toolbar toolbar, const char *description, const char *icon, const Toggle &toggle)
+{
+    auto button = toolbar_append_toggle_button(toolbar, description, icon, toggle.m_command.m_callback);
+    toggle.m_exportCallback(PointerCaller<void, void(bool), toggle_button_set_active_callback>(button._handle));
+    return button;
 }