From 982c0be69cef7f936a6a6899c681f4ddeb389f29 Mon Sep 17 00:00:00 2001
From: Till Theato <root@ttill.de>
Date: Sun, 1 Aug 2010 10:21:41 +0000
Subject: [PATCH] Color Picker: Use select rectangle as cursor for rects with a
 width of 10 or larger

svn path=/trunk/kdenlive/; revision=4676
---
 icons/hi128-action-kdenlive-select-all.png | Bin 0 -> 552 bytes
 icons/hi22-action-kdenlive-select-all.png  | Bin 0 -> 398 bytes
 icons/hi32-action-kdenlive-select-all.png  | Bin 0 -> 246 bytes
 icons/hi48-action-kdenlive-select-all.png  | Bin 0 -> 330 bytes
 icons/hi64-action-kdenlive-select-all.png  | Bin 0 -> 356 bytes
 icons/ox128-action-kdenlive-select-all.png | Bin 0 -> 552 bytes
 icons/ox22-action-kdenlive-select-all.png  | Bin 0 -> 398 bytes
 icons/ox32-action-kdenlive-select-all.png  | Bin 0 -> 246 bytes
 icons/ox48-action-kdenlive-select-all.png  | Bin 0 -> 330 bytes
 icons/ox64-action-kdenlive-select-all.png  | Bin 0 -> 356 bytes
 src/colorpickerwidget.cpp                  |   8 ++++----
 11 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 icons/hi128-action-kdenlive-select-all.png
 create mode 100644 icons/hi22-action-kdenlive-select-all.png
 create mode 100644 icons/hi32-action-kdenlive-select-all.png
 create mode 100644 icons/hi48-action-kdenlive-select-all.png
 create mode 100644 icons/hi64-action-kdenlive-select-all.png
 create mode 100644 icons/ox128-action-kdenlive-select-all.png
 create mode 100644 icons/ox22-action-kdenlive-select-all.png
 create mode 100644 icons/ox32-action-kdenlive-select-all.png
 create mode 100644 icons/ox48-action-kdenlive-select-all.png
 create mode 100644 icons/ox64-action-kdenlive-select-all.png

diff --git a/icons/hi128-action-kdenlive-select-all.png b/icons/hi128-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba043fc2cf073b010a753b818b835425221ba85a
GIT binary patch
literal 552
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z<n01s#%uRBiUS2DOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kz!zAT<YoK
z7*a9k?Va1X%?<(%7X@~Tyx6bMr6~JGtI1~1_c=^G_Un#$$ek^Vy?%Uh-{T!$8=qI^
z&HG<{{{NoO2KVMOJYo^}KI?DVoxi@1>WvwJJoSbhx%bQ8GjPw|`*<cpAybF2!=2ab
z_cPdMf8$GMI>M>o2N9eD(z@MtukeX#Lx?^LMwsko{tXt^jXbDopW8Xi;RG6wP$uj!
zr?%nfPW}TEKxQFi-Z3A6+6=Y?EOC=PV$N@d!D-~3?f<!FycIZi=dR(GKk4)H(L?Dw
ZtLFc}e6^|e2Z6E5;OXk;vd$@?2>>a^!e0OY

literal 0
HcmV?d00001

diff --git a/icons/hi22-action-kdenlive-select-all.png b/icons/hi22-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f722c96a52df365f582e7d62b6da7a666f75edd
GIT binary patch
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z2y=iiW82Qw-9SOf64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&xjkJR
zLo9mVUe)z;b`&}KF+N_3rLCVeWN)?s%V8$12}>hn4mwA0CKRZIZf((PU=49Fobh@W
z0|#4Ru#5acPEG~4Z!>1jvHWaa?zb%TdZ~Q>Ov~O5?K#mI`o`*l8#}ij+kO6w-Jhws
zkNMOk5;{DE=b62BFW&d&r)qWg<*?Z6#dA`gIWW2&k-Bz!$AKLzB1Xk+k=b_hrzbUa
z+;Cg2<rTZ4eYuvBn&3rk-}M{1-!`2QkJ<jQFH$ort<O-;Zjb&}Z)W91-J7+PehFUG
zJn`<qhD|F<wkt?<hX+PE=d9H_yXsQ>ufUfb7RRLGjEk>SSl`HhXOr^m%l?~Bz3wM4
ppO-Mb$EY{^@5J}}-=2S?F348UmHel0DlqIAJYD@<);T3K0RWrQnx_B&

literal 0
HcmV?d00001

diff --git a/icons/hi32-action-kdenlive-select-all.png b/icons/hi32-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dd0fe8a33affa2beaa1ff3b72b669ef58bcbecb
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QXm68T^vIq
zTHj80<YQ3eU_SUJ_{D$uC&?dNHtnjO8h2~)5ssxZUC#ShvnE*2DgL$g7sG_-t$vj*
zOKxsIeS6iy`RCm4uWDpp-8kug>xSSG_6*4t0+(bL6gRwUuu$OZV15Lr9G)N8)^sku
d@ajwLh^ZTW#0x6lMgpy8@O1TaS?83{1OWbgS&#q#

literal 0
HcmV?d00001

diff --git a/icons/hi48-action-kdenlive-select-all.png b/icons/hi48-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..db927103d7571ac1b9ab916a61c47e971f6bab39
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq
zG}}O!QR&V79-yFPiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w=JzX3_
zG8*5`a^yR#AizAmYx#!vI+f4u+Tw0?tjY|X*nEBBa}ic0$;2ZvLB}M%@s__&E3=ol
zrL-u0M*MvJvuEDCSo|iWIzEv7X~eQE*S_(&x;VD|6feJT9G)^kIA=ZkDcKo27c$RT
zdTWbp&y@J@49wG42*`eZ>K(c8r`&_}6Jj`c>RT@`icRER>ZsT9Oh|N*v)&ZWodQz-
zxE3<&D2aPD$8elg)pBW%(GV_DH2EXy#2(?IH-&Adz^s1fGas6d+syyRb3y+BW8Aeu
VpGluvRDfP$@O1TaS?83{1OT+=d3pc<

literal 0
HcmV?d00001

diff --git a/icons/hi64-action-kdenlive-select-all.png b/icons/hi64-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2b8c0c213c8015c04781f046b4a4240b6f6d83c
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0GaPZ!6K
ziaBp*J8~U15IFK`(()Vs>nF%Rz9T;AS->JQ<+<4chn?CRw`{%knk%{Iviv#A+xGkF
z=i7QEtUg)e^(pg6yu<6g?y(MgfBfLSk<qw&rMO%@Bbx*Fg)OUnKdd|w-@tf*$)wQs
zfLeqBLsY{t+Xk@(hCqheI`$pxB0NA|A^!r_3=pI9HRC%*R%RgY4s!;h6o~Pts-fE9
zAOn#19i$n^n6*Rhfm{GSqxk-_)_sk>pTEC<KLf~&GPY>}?=@p$(}133@O1TaS?83{
F1OT48ewhFO

literal 0
HcmV?d00001

diff --git a/icons/ox128-action-kdenlive-select-all.png b/icons/ox128-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba043fc2cf073b010a753b818b835425221ba85a
GIT binary patch
literal 552
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z<n01s#%uRBiUS2DOI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kz!zAT<YoK
z7*a9k?Va1X%?<(%7X@~Tyx6bMr6~JGtI1~1_c=^G_Un#$$ek^Vy?%Uh-{T!$8=qI^
z&HG<{{{NoO2KVMOJYo^}KI?DVoxi@1>WvwJJoSbhx%bQ8GjPw|`*<cpAybF2!=2ab
z_cPdMf8$GMI>M>o2N9eD(z@MtukeX#Lx?^LMwsko{tXt^jXbDopW8Xi;RG6wP$uj!
zr?%nfPW}TEKxQFi-Z3A6+6=Y?EOC=PV$N@d!D-~3?f<!FycIZi=dR(GKk4)H(L?Dw
ZtLFc}e6^|e2Z6E5;OXk;vd$@?2>>a^!e0OY

literal 0
HcmV?d00001

diff --git a/icons/ox22-action-kdenlive-select-all.png b/icons/ox22-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f722c96a52df365f582e7d62b6da7a666f75edd
GIT binary patch
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z2y=iiW82Qw-9SOf64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&xjkJR
zLo9mVUe)z;b`&}KF+N_3rLCVeWN)?s%V8$12}>hn4mwA0CKRZIZf((PU=49Fobh@W
z0|#4Ru#5acPEG~4Z!>1jvHWaa?zb%TdZ~Q>Ov~O5?K#mI`o`*l8#}ij+kO6w-Jhws
zkNMOk5;{DE=b62BFW&d&r)qWg<*?Z6#dA`gIWW2&k-Bz!$AKLzB1Xk+k=b_hrzbUa
z+;Cg2<rTZ4eYuvBn&3rk-}M{1-!`2QkJ<jQFH$ort<O-;Zjb&}Z)W91-J7+PehFUG
zJn`<qhD|F<wkt?<hX+PE=d9H_yXsQ>ufUfb7RRLGjEk>SSl`HhXOr^m%l?~Bz3wM4
ppO-Mb$EY{^@5J}}-=2S?F348UmHel0DlqIAJYD@<);T3K0RWrQnx_B&

literal 0
HcmV?d00001

diff --git a/icons/ox32-action-kdenlive-select-all.png b/icons/ox32-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dd0fe8a33affa2beaa1ff3b72b669ef58bcbecb
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zq}PKmW1Q4P8K9tKiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QXm68T^vIq
zTHj80<YQ3eU_SUJ_{D$uC&?dNHtnjO8h2~)5ssxZUC#ShvnE*2DgL$g7sG_-t$vj*
zOKxsIeS6iy`RCm4uWDpp-8kug>xSSG_6*4t0+(bL6gRwUuu$OZV15Lr9G)N8)^sku
d@ajwLh^ZTW#0x6lMgpy8@O1TaS?83{1OWbgS&#q#

literal 0
HcmV?d00001

diff --git a/icons/ox48-action-kdenlive-select-all.png b/icons/ox48-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..db927103d7571ac1b9ab916a61c47e971f6bab39
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8wRq
zG}}O!QR&V79-yFPiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0w=JzX3_
zG8*5`a^yR#AizAmYx#!vI+f4u+Tw0?tjY|X*nEBBa}ic0$;2ZvLB}M%@s__&E3=ol
zrL-u0M*MvJvuEDCSo|iWIzEv7X~eQE*S_(&x;VD|6feJT9G)^kIA=ZkDcKo27c$RT
zdTWbp&y@J@49wG42*`eZ>K(c8r`&_}6Jj`c>RT@`icRER>ZsT9Oh|N*v)&ZWodQz-
zxE3<&D2aPD$8elg)pBW%(GV_DH2EXy#2(?IH-&Adz^s1fGas6d+syyRb3y+BW8Aeu
VpGluvRDfP$@O1TaS?83{1OT+=d3pc<

literal 0
HcmV?d00001

diff --git a/icons/ox64-action-kdenlive-select-all.png b/icons/ox64-action-kdenlive-select-all.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2b8c0c213c8015c04781f046b4a4240b6f6d83c
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0GaPZ!6K
ziaBp*J8~U15IFK`(()Vs>nF%Rz9T;AS->JQ<+<4chn?CRw`{%knk%{Iviv#A+xGkF
z=i7QEtUg)e^(pg6yu<6g?y(MgfBfLSk<qw&rMO%@Bbx*Fg)OUnKdd|w-@tf*$)wQs
zfLeqBLsY{t+Xk@(hCqheI`$pxB0NA|A^!r_3=pI9HRC%*R%RgY4s!;h6o~Pts-fE9
zAOn#19i$n^n6*Rhfm{GSqxk-_)_sk>pTEC<KLf~&GPY>}?=@p$(}133@O1TaS?83{
F1OT48ewhFO

literal 0
HcmV?d00001

diff --git a/src/colorpickerwidget.cpp b/src/colorpickerwidget.cpp
index 2cf12c3b..a6bafd93 100644
--- a/src/colorpickerwidget.cpp
+++ b/src/colorpickerwidget.cpp
@@ -71,8 +71,8 @@ ColorPickerWidget::ColorPickerWidget(QWidget *parent) :
 
     m_size = new QSpinBox(this);
     m_size->setMinimum(1);
-    // Use qMax here, to make it possible to get the average for the whole screen
-    m_size->setMaximum(qMax(qApp->desktop()->geometry().width(), qApp->desktop()->geometry().height()));
+    // Use qMin here, as we might run into troubles with the cursor otherwise.
+    m_size->setMaximum(qMin(qApp->desktop()->geometry().width(), qApp->desktop()->geometry().height()));
     m_size->setValue(1);
 
     layout->addWidget(button);
@@ -176,10 +176,10 @@ void ColorPickerWidget::slotSetupEventFilter()
     m_filter = new KCDPickerFilter(this);
     kapp->installX11EventFilter(m_filter);
 #endif
-    if (m_size->value() == 1)
+    if (m_size->value() < 10)
         grabMouse(QCursor(KIcon("color-picker").pixmap(22, 22), 0, 21));
     else
-        grabMouse(Qt::CrossCursor);
+        grabMouse(QCursor(KIcon("kdenlive-select-all").pixmap(m_size->value(), m_size->value())));
     grabKeyboard();
 }
 
-- 
2.39.2