Skip to content

Commit 3646add

Browse files
committed
Remove align toolbar
Let's do this properly for v1.1 instead of rushing it for v1.0.
1 parent 709c730 commit 3646add

File tree

4 files changed

+7
-325
lines changed

4 files changed

+7
-325
lines changed

src/app/friction.qss

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -602,16 +602,13 @@ QCheckBox:disabled {
602602
}
603603

604604
QToolBar#DarkToolBar,
605-
Friction--Ui--TransformToolBar,
606-
Friction--Ui--AlignToolBar {
605+
Friction--Ui--TransformToolBar {
607606
background-color: %5;
608607
}
609608

610609
QToolBar#ColorToolBar QToolButton:hover,
611610
QToolBar#CanvasToolBar QToolButton:hover,
612-
Friction--Ui--TransformToolBar QToolButton:hover,
613-
Friction--Ui--AlignToolBar QToolButton:!hover:checked
614-
{
611+
Friction--Ui--TransformToolBar QToolButton:hover {
615612
background-color: transparent;
616613
border-color: transparent;
617614
}
@@ -638,17 +635,15 @@ Friction--Ui--ToolBar::separator:horizontal {
638635
width: 1px;
639636
}
640637

641-
Friction--Ui--TransformToolBar::separator,
642-
Friction--Ui--AlignToolBar::separator {
638+
Friction--Ui--TransformToolBar::separator {
643639
background-color: transparent;
644640
}
645641

646-
Friction--Ui--TransformToolBar::separator:horizontal,
647-
Friction--Ui--AlignToolBar::separator:horizontal {
642+
Friction--Ui--TransformToolBar::separator:horizontal {
648643
width: 2px;
649644
}
650645

651-
Friction--Ui--AlignToolBar QComboBox {
646+
Friction--Ui--TransformToolBar QComboBox {
652647
padding: .1em;
653648
}
654649

src/ui/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ set(
6767
widgets/aboutwidget.cpp
6868
widgets/actionbutton.cpp
6969
widgets/alignwidget.cpp
70-
widgets/aligntoolbar.cpp
7170
widgets/framescrollbar.cpp
7271
widgets/assetswidget.cpp
7372
widgets/bookmarkedcolors.cpp
@@ -107,11 +106,11 @@ set(
107106
widgets/transformtoolbar.cpp
108107
widgets/twocolumnlayout.cpp
109108
widgets/uilayout.cpp
109+
widgets/viewertoolbar.cpp
110110
widgets/welcomedialog.cpp
111111
widgets/widgetstack.cpp
112112
widgets/widgetwrappernode.cpp
113113
widgets/wrappernode.cpp
114-
widgets/viewertoolbar.cpp
115114
)
116115

117116
set(
@@ -142,7 +141,6 @@ set(
142141
widgets/aboutwidget.h
143142
widgets/actionbutton.h
144143
widgets/alignwidget.h
145-
widgets/aligntoolbar.h
146144
widgets/fillstrokesettings.h
147145
widgets/framescrollbar.h
148146
widgets/assetswidget.h
@@ -184,11 +182,11 @@ set(
184182
widgets/twocolumnlayout.h
185183
widgets/uilayout.h
186184
widgets/vlabel.h
185+
widgets/viewertoolbar.h
187186
widgets/welcomedialog.h
188187
widgets/widgetstack.h
189188
widgets/widgetwrappernode.h
190189
widgets/wrappernode.h
191-
widgets/viewertoolbar.h
192190
)
193191

194192
if(NOT WIN32)

src/ui/widgets/aligntoolbar.cpp

Lines changed: 0 additions & 236 deletions
This file was deleted.

src/ui/widgets/aligntoolbar.h

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)