63d4385 · unity8 · git.iko.soy

git.iko.soy/unity8

Feature complete

commit63d4385d37696392a2c93077bdc2f50b16edeba6 authorJosh Arenson <joshua.arenson@canonical.com> dateTue 9 Dec 2014, 14:03 (12 years ago) parent363bfef

2 files changed+30−27

compare with xenial

unifiedsplit

qml/Components/PhysicalKeysFilter.qml+27−4 qml/Shell.qml+3−23

qml/Components/PhysicalKeysFilter.qml+27−4

@@ -23,8 +23,8 @@ import QtQuick 2.0

2323

2424 A filter to handle events triggered by pressing physical keys on a device.

2525 Keys included are

26− * Volume Increase

2726 * Volume Decrease

27+ * Volume Increase

2828 * Power

2929

3030 This allows for handling the following events

@@ -36,10 +36,14 @@ import QtQuick 2.0

3636QtObject {

3737 id: root

3838

39+ signal powerPressed()

40+ signal screenshotPressed()

3941 signal volumeDownPressed()

4042 signal volumeUpPressed()

41− signal screenshotPressed()

4243

44+ property bool eventAccepted: false

45+

46+ property bool aPowerKeyWasReleased: true

4347 property bool powerKeyPressed: false

4448

4549 property bool aVolumeKeyWasReleased: true

@@ -47,16 +51,25 @@ QtObject {

4751 property bool volumeUpKeyPressed: false

4852

4953 function onKeyPressed(key) {

54+ /* Determine what key was pressed */

55+

56+ // Power Key

5057 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {

58+ eventAccepted = true;

5159 powerKeyPressed = true;

5260 }

61+

62+ //Volume Keys

5363 else if (key == Qt.Key_VolumeDown) {

64+ eventAccepted = true;

5465 volumeDownKeyPressed = true;

5566 }

5667 else if (key == Qt.Key_VolumeUp) {

68+ eventAccepted = true;

5769 volumeUpKeyPressed = true;

5870 }

5971

72+ /* Determine how to handle it */

6073 if (volumeDownKeyPressed && volumeUpKeyPressed) {

6174 if (aVolumeKeyWasReleased) {

6275 bothVolumeKeysPressed();

@@ -64,28 +77,38 @@ QtObject {

6477 aVolumeKeyWasReleased = false;

6578 }

6679 else if (volumeDownKeyPressed) {

67− if (powerKeyPressed) {

80+ if (powerKeyPressed && aPowerKeyWasReleased) {

6881 screenshotPressed();

69− } else {

82+ aPowerKeyWasReleased = false;

83+ // Don't emit volumeDownPressed if power key is held

84+ } else if (aPowerKeyWasReleased){

7085 volumeDownPressed();

7186 }

7287 }

7388 else if (volumeUpKeyPressed) {

7489 volumeUpPressed();

7590 }

91+

92+ return eventAccepted;

7693 }

7794

7895 function onKeyReleased(key) {

7996 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {

97+ eventAccepted = true;

8098 powerKeyPressed = false;

99+ aPowerKeyWasReleased = true;

81100 }

82101 else if (key == Qt.Key_VolumeDown) {

102+ eventAccepted = true;

83103 volumeDownKeyPressed = false;

84104 aVolumeKeyWasReleased = false;

85105 }

86106 else if (key == Qt.Key_VolumeUp) {

107+ eventAccepted = true;

87108 volumeUpKeyPressed = false;

88109 aVolumeKeyWasReleased = true;

89110 }

111+

112+ return eventAccepted;

90113 }

91114}

qml/Shell.qml+3−23

@@ -157,6 +157,7 @@ Item {

157157 PhysicalKeysFilter {

158158 id: physicalKeysFilter

159159

160+ onPowerPressed: dialogs.onPowerKeyPressed();

160161 onVolumeDownPressed: volumeControl.volumeDown()

161162 onVolumeUpPressed: volumeControl.volumeUp()

162163 onScreenshotPressed: screenGrabber.capture()

@@ -174,34 +175,13 @@ Item {

174175 value: launcher.shown || launcher.dashSwipe

175176 }

176177

177− /*VolumeKeyFilter {

178− id: volumeKeyFilter

179− onVolumeDownPressed: volumeControl.volumeDown()

180− onVolumeUpPressed: volumeControl.volumeUp()

181− onBothVolumeKeysPressed: screenGrabber.capture()

182− }*/

183−

184178 WindowKeysFilter {

185179 Keys.onPressed: {

186− physicalKeysFilter.onKeyPressed(event.key);

187− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {

188− dialogs.onPowerKeyPressed();

189− event.accepted = true;

190− } else {

191− //volumeKeyFilter.onKeyPressed(event.key);

192− event.accepted = false;

193− }

180+ event.accepted = physicalKeysFilter.onKeyPressed(event.key);

194181 }

195182

196183 Keys.onReleased: {

197− physicalKeysFilter.onKeyReleased(event.key);

198− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {

199− dialogs.onPowerKeyReleased();

200− event.accepted = true;

201− } else {

202− //volumeKeyFilter.onKeyReleased(event.key);

203− event.accepted = false;

204− }

184+ event.accepted = physicalKeysFilter.onKeyReleased(event.key);

205185 }

206186 }

207187