mirror of
				https://github.com/RGBCube/serenity
				synced 2025-10-31 18:22:45 +00:00 
			
		
		
		
	LibGUI+FileManager: Misc tweaks courtesy of clang-format
This commit is contained in:
		
							parent
							
								
									fdeb91e000
								
							
						
					
					
						commit
						10324f95b0
					
				
					 16 changed files with 21 additions and 20 deletions
				
			
		|  | @ -272,8 +272,10 @@ int main(int argc, char** argv) | ||||||
|               properties->exec(); |               properties->exec(); | ||||||
|           }); |           }); | ||||||
| 
 | 
 | ||||||
|     enum class ConfirmBeforeDelete { No, |     enum class ConfirmBeforeDelete { | ||||||
|         Yes }; |         No, | ||||||
|  |         Yes | ||||||
|  |     }; | ||||||
| 
 | 
 | ||||||
|     auto do_delete = [&](ConfirmBeforeDelete confirm, const GAction& action) { |     auto do_delete = [&](ConfirmBeforeDelete confirm, const GAction& action) { | ||||||
|         Vector<String> paths; |         Vector<String> paths; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <LibCore/CTimer.h> | #include <LibCore/CTimer.h> | ||||||
| #include <LibGUI/GWidget.h> |  | ||||||
| #include <LibDraw/TextAlignment.h> | #include <LibDraw/TextAlignment.h> | ||||||
|  | #include <LibGUI/GWidget.h> | ||||||
| 
 | 
 | ||||||
| class GPainter; | class GPainter; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,11 +1,11 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <AK/String.h> |  | ||||||
| #include <AK/Badge.h> | #include <AK/Badge.h> | ||||||
| #include <AK/Function.h> | #include <AK/Function.h> | ||||||
| #include <AK/HashTable.h> | #include <AK/HashTable.h> | ||||||
| #include <AK/NonnullRefPtr.h> | #include <AK/NonnullRefPtr.h> | ||||||
| #include <AK/RefCounted.h> | #include <AK/RefCounted.h> | ||||||
|  | #include <AK/String.h> | ||||||
| #include <AK/WeakPtr.h> | #include <AK/WeakPtr.h> | ||||||
| #include <AK/Weakable.h> | #include <AK/Weakable.h> | ||||||
| #include <LibDraw/GraphicsBitmap.h> | #include <LibDraw/GraphicsBitmap.h> | ||||||
|  |  | ||||||
|  | @ -1,10 +1,10 @@ | ||||||
| #include <AK/StringBuilder.h> | #include <AK/StringBuilder.h> | ||||||
| #include <Kernel/KeyCode.h> | #include <Kernel/KeyCode.h> | ||||||
|  | #include <LibDraw/StylePainter.h> | ||||||
| #include <LibGUI/GAction.h> | #include <LibGUI/GAction.h> | ||||||
| #include <LibGUI/GActionGroup.h> | #include <LibGUI/GActionGroup.h> | ||||||
| #include <LibGUI/GButton.h> | #include <LibGUI/GButton.h> | ||||||
| #include <LibGUI/GPainter.h> | #include <LibGUI/GPainter.h> | ||||||
| #include <LibDraw/StylePainter.h> |  | ||||||
| 
 | 
 | ||||||
| GButton::GButton(GWidget* parent) | GButton::GButton(GWidget* parent) | ||||||
|     : GAbstractButton(parent) |     : GAbstractButton(parent) | ||||||
|  |  | ||||||
|  | @ -1,11 +1,11 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <AK/String.h> |  | ||||||
| #include <AK/Function.h> | #include <AK/Function.h> | ||||||
| #include <LibGUI/GAbstractButton.h> | #include <AK/String.h> | ||||||
| #include <LibDraw/GraphicsBitmap.h> | #include <LibDraw/GraphicsBitmap.h> | ||||||
| #include <LibDraw/StylePainter.h> | #include <LibDraw/StylePainter.h> | ||||||
| #include <LibDraw/TextAlignment.h> | #include <LibDraw/TextAlignment.h> | ||||||
|  | #include <LibGUI/GAbstractButton.h> | ||||||
| 
 | 
 | ||||||
| class GAction; | class GAction; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <AK/String.h> |  | ||||||
| #include <AK/Function.h> | #include <AK/Function.h> | ||||||
|  | #include <AK/String.h> | ||||||
| #include <LibGUI/GAbstractButton.h> | #include <LibGUI/GAbstractButton.h> | ||||||
| 
 | 
 | ||||||
| class GCheckBox : public GAbstractButton { | class GCheckBox : public GAbstractButton { | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <AK/String.h> |  | ||||||
| #include <AK/Badge.h> | #include <AK/Badge.h> | ||||||
| #include <AK/Function.h> | #include <AK/Function.h> | ||||||
|  | #include <AK/String.h> | ||||||
| #include <LibDraw/Rect.h> | #include <LibDraw/Rect.h> | ||||||
| 
 | 
 | ||||||
| class GWindowServerConnection; | class GWindowServerConnection; | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <AK/String.h> |  | ||||||
| #include <AK/Function.h> | #include <AK/Function.h> | ||||||
| #include <AK/HashMap.h> | #include <AK/HashMap.h> | ||||||
|  | #include <AK/String.h> | ||||||
| 
 | 
 | ||||||
| class Font; | class Font; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
|  | #include <LibDraw/StylePainter.h> | ||||||
| #include <LibGUI/GFrame.h> | #include <LibGUI/GFrame.h> | ||||||
| #include <LibGUI/GPainter.h> | #include <LibGUI/GPainter.h> | ||||||
| #include <LibDraw/StylePainter.h> |  | ||||||
| 
 | 
 | ||||||
| GFrame::GFrame(GWidget* parent) | GFrame::GFrame(GWidget* parent) | ||||||
|     : GWidget(parent) |     : GWidget(parent) | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <LibGUI/GWidget.h> |  | ||||||
| #include <LibDraw/StylePainter.h> | #include <LibDraw/StylePainter.h> | ||||||
|  | #include <LibGUI/GWidget.h> | ||||||
| 
 | 
 | ||||||
| class GFrame : public GWidget { | class GFrame : public GWidget { | ||||||
|     C_OBJECT(GFrame) |     C_OBJECT(GFrame) | ||||||
|  |  | ||||||
|  | @ -116,7 +116,7 @@ void GItemView::mousedown_event(GMouseEvent& event) | ||||||
|     if (event.button() == GMouseButton::Left) { |     if (event.button() == GMouseButton::Left) { | ||||||
|         m_left_mousedown_position = event.position(); |         m_left_mousedown_position = event.position(); | ||||||
|         if (item_index == -1) { |         if (item_index == -1) { | ||||||
|             if(event.modifiers() & Mod_Ctrl) { |             if (event.modifiers() & Mod_Ctrl) { | ||||||
|                 selection().for_each_index([&](auto& index) { |                 selection().for_each_index([&](auto& index) { | ||||||
|                     m_rubber_band_remembered_selection.append(index); |                     m_rubber_band_remembered_selection.append(index); | ||||||
|                 }); |                 }); | ||||||
|  | @ -150,7 +150,7 @@ void GItemView::mouseup_event(GMouseEvent& event) | ||||||
|     } |     } | ||||||
|     int item_index = item_at_event_position(event.position()); |     int item_index = item_at_event_position(event.position()); | ||||||
|     auto index = model()->index(item_index, m_model_column); |     auto index = model()->index(item_index, m_model_column); | ||||||
|     if((selection().size() > 1) & m_might_drag) { |     if ((selection().size() > 1) & m_might_drag) { | ||||||
|         selection().set(index); |         selection().set(index); | ||||||
|         m_might_drag = false; |         m_might_drag = false; | ||||||
|     } |     } | ||||||
|  | @ -170,7 +170,7 @@ void GItemView::mousemove_event(GMouseEvent& event) | ||||||
|             for (auto item_index : items_intersecting_rect(rubber_band_rect)) { |             for (auto item_index : items_intersecting_rect(rubber_band_rect)) { | ||||||
|                 selection().add(model()->index(item_index, model_column())); |                 selection().add(model()->index(item_index, model_column())); | ||||||
|             } |             } | ||||||
|             if(event.modifiers() & Mod_Ctrl) { |             if (event.modifiers() & Mod_Ctrl) { | ||||||
|                 for (auto storeditem : m_rubber_band_remembered_selection) { |                 for (auto storeditem : m_rubber_band_remembered_selection) { | ||||||
|                     selection().add(storeditem); |                     selection().add(storeditem); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <LibGUI/GFrame.h> |  | ||||||
| #include <LibDraw/TextAlignment.h> | #include <LibDraw/TextAlignment.h> | ||||||
|  | #include <LibGUI/GFrame.h> | ||||||
| 
 | 
 | ||||||
| class GraphicsBitmap; | class GraphicsBitmap; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,9 +1,9 @@ | ||||||
| #pragma once | #pragma once | ||||||
| 
 | 
 | ||||||
| #include <AK/String.h> |  | ||||||
| #include <AK/Badge.h> | #include <AK/Badge.h> | ||||||
| #include <AK/NonnullOwnPtr.h> | #include <AK/NonnullOwnPtr.h> | ||||||
| #include <AK/OwnPtr.h> | #include <AK/OwnPtr.h> | ||||||
|  | #include <AK/String.h> | ||||||
| 
 | 
 | ||||||
| class GAction; | class GAction; | ||||||
| class GMenu; | class GMenu; | ||||||
|  |  | ||||||
|  | @ -26,7 +26,7 @@ public: | ||||||
|     virtual GVariant value() const = 0; |     virtual GVariant value() const = 0; | ||||||
|     virtual void set_value(const GVariant&) = 0; |     virtual void set_value(const GVariant&) = 0; | ||||||
| 
 | 
 | ||||||
|     virtual void will_begin_editing() { } |     virtual void will_begin_editing() {} | ||||||
| 
 | 
 | ||||||
| protected: | protected: | ||||||
|     virtual RefPtr<GWidget> create_widget() = 0; |     virtual RefPtr<GWidget> create_widget() = 0; | ||||||
|  |  | ||||||
|  | @ -66,7 +66,6 @@ void GUndoStack::push(NonnullOwnPtr<GCommand>&& command) | ||||||
|     m_stack[0].m_undo_vector.prepend(move(command)); |     m_stack[0].m_undo_vector.prepend(move(command)); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| void GUndoStack::finalize_current_combo() | void GUndoStack::finalize_current_combo() | ||||||
| { | { | ||||||
|     if (m_stack.is_empty()) |     if (m_stack.is_empty()) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Sergey Bugaev
						Sergey Bugaev