Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
56c650cd
Commit
56c650cd
authored
Nov 26, 2019
by
Jean-Baptiste Mardelle
Browse files
Fix curve effect icon placement. Related to
#452
parent
4d7d7127
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/assets/view/widgets/curves/curveparamwidget.ipp
View file @
56c650cd
...
...
@@ -141,6 +141,7 @@ CurveParamWidget<CurveWidget_t>::CurveParamWidget(std::shared_ptr<AssetParameter
layout->setSpacing(0);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
layout->addWidget(m_edit);
m_edit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
m_leftParam = new ValueLabel<CurveWidget_t>(true, m_mode, this);
m_leftParam->setFrameStyle(QFrame::StyledPanel | QFrame::Plain);
...
...
@@ -197,8 +198,15 @@ CurveParamWidget<CurveWidget_t>::CurveParamWidget(std::shared_ptr<AssetParameter
template <> void CurveParamWidget<KisCurveWidget>::deleteIrrelevantItems()
{
m_ui.gridLayout->removeItem(m_ui.horizontalSpacer_3);
delete m_ui.horizontalSpacer_3;
delete m_ui.layoutH1;
delete m_ui.layoutH2;
delete m_ui.buttonLinkHandles;
delete m_ui.handlesLayout;
m_ui.gridLayout->removeWidget(m_ui.buttonShowAllHandles);
delete m_ui.buttonShowAllHandles;
}
template <typename CurveWidget_t> void CurveParamWidget<CurveWidget_t>::deleteIrrelevantItems()
...
...
src/ui/bezierspline_ui.ui
View file @
56c650cd
...
...
@@ -6,135 +6,128 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
338
</width>
<height>
1
99
</height>
<width>
230
</width>
<height>
1
18
</height>
</rect>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QWidget"
name=
"widgetPoint"
native=
"true"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Maximum"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"0"
colspan=
"3"
>
<widget
class=
"QWidget"
name=
"widget"
native=
"true"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<item>
<layout
class=
"QHBoxLayout"
name=
"layoutP"
/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QToolButton"
name=
"buttonDeletePoint"
>
<property
name=
"toolTip"
>
<string>
Delete current point
</string>
</property>
<property
name=
"text"
>
<string>
...
</string>
</property>
<property
name=
"autoRaise"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item
row=
"0"
column=
"2"
colspan=
"2"
>
<spacer
name=
"horizontalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
133
</width>
<height>
17
</height>
</size>
</property>
</spacer>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_2"
>
<item>
<widget
class=
"QWidget"
name=
"widgetPoint"
native=
"true"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Maximum"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<item
row=
"0"
column=
"0"
colspan=
"3"
>
<widget
class=
"QWidget"
name=
"widget"
native=
"true"
>
<property
name=
"minimumSize"
>
<size>
<width>
0
</width>
<height>
20
</height>
</size>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<item>
<layout
class=
"QHBoxLayout"
name=
"layoutP"
/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget
class=
"QToolButton"
name=
"buttonDeletePoint"
>
<property
name=
"toolTip"
>
<string>
Delete current point
</string>
</property>
<property
name=
"text"
>
<string>
...
</string>
</property>
<property
name=
"autoRaise"
>
<bool>
true
</bool>
</property>
</widget>
</item>
</layout>
</item>
<item
row=
"1"
column=
"0"
>
<layout
class=
"QHBoxLayout"
name=
"layoutH1"
/>
</item>
<item
row=
"1"
column=
"1"
>
<widget
class=
"QToolButton"
name=
"buttonLinkHandles"
>
<property
name=
"toolTip"
>
<string>
Link the handles' position for current point.
<
br /
>
Results in a natural spline.
</string>
</property>
<property
name=
"text"
>
<string>
...
</string>
</property>
<property
name=
"checkable"
>
<bool>
true
</bool>
</property>
<property
name=
"autoRaise"
>
<bool>
true
</bool>
</property>
</widget>
</item>
<item
row=
"1"
column=
"2"
colspan=
"2"
>
<spacer
name=
"horizontalSpacer_3"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
<layout
class=
"QGridLayout"
name=
"handlesLayout"
>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<
property
name=
"sizeHint"
stdset
=
"0"
>
<
size
>
<width>
133
</width
>
<height>
46
</height
>
<
/size
>
<
/
property>
<
/spacer
>
</
item
>
<item
row=
"2"
column=
"0
"
>
<
layout
class=
"QHBoxLayout"
name=
"layoutH2"
/
>
</
item
>
<item
row=
"2"
column=
"1"
colspan=
"3
"
>
<
spacer
name=
"horizontalSpacer_4"
>
<
property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum
>
</property
>
<
property
name=
"sizeHint"
stdset=
"0"
>
<
size
>
<width>
40
</width
>
<height>
20
</height
>
<
/size
>
</
property
>
</
spacer
>
<
item
row=
"0"
column
=
"0"
>
<
layout
class=
"QHBoxLayout"
name=
"layoutH1"
/
>
</item
>
<item
row=
"0"
column=
"1"
>
<
widget
class=
"QToolButton"
name=
"buttonLinkHandles"
>
<property
name=
"toolTip"
>
<
string>
Link the handles' position for current point.
<
br /
>
Results in a natural spline.
</string
>
</
property
>
<property
name=
"text
"
>
<
string>
...
</string
>
</
property
>
<property
name=
"checkable
"
>
<
bool>
true
</bool
>
</
property>
<property
name=
"autoRaise"
>
<bool>
true
</bool
>
</
property>
<
/widget
>
</item
>
<item
row=
"1"
column=
"0"
>
<
layout
class=
"QHBoxLayout"
name=
"layoutH2"
/
>
</
item
>
</
layout
>
</item>
<item
row=
"
3
"
column=
"0"
colspan=
"3"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_
2
"
>
<item
row=
"
2
"
column=
"0"
colspan=
"3"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_
4
"
>
<item>
<widget
class=
"QToolButton"
name=
"buttonResetSpline"
>
<property
name=
"toolTip"
>
...
...
@@ -227,7 +220,7 @@
</item>
</layout>
</item>
<item
row=
"
3
"
column=
"3"
>
<item
row=
"
2
"
column=
"3"
>
<spacer
name=
"spacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
...
...
@@ -240,6 +233,45 @@
</property>
</spacer>
</item>
<item
row=
"3"
column=
"1"
>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
1
</height>
</size>
</property>
</spacer>
</item>
<item
row=
"1"
column=
"1"
colspan=
"3"
>
<spacer
name=
"horizontalSpacer_3"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
150
</width>
<height>
43
</height>
</size>
</property>
</spacer>
</item>
<item
row=
"0"
column=
"1"
colspan=
"3"
>
<spacer
name=
"horizontalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
177
</width>
<height>
33
</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment