Skip to content

Commit d4aef11

Browse files
committed
[*] refactor
1 parent 50f3a8b commit d4aef11

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

wayshot/ui/logic.slint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export global Logic {
179179

180180
callback push-stream-verify-setting(setting: SettingPushStream) -> string;
181181

182-
callback camera-setting-dialog-start-playing(camera: string, setting: SettingCamera);
182+
callback camera-setting-dialog-start-playing(camera: string);
183183
callback camera-setting-dialog-stop-playing();
184184
callback camera-setting-dialog-zoom-image();
185185

wayshot/ui/panel/desktop/camera-setting-dialog.slint

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export component CameraSettingDialog inherits Dialog {
2929

3030
in property <length> inner-height: Theme.default-height * 0.8;
3131

32-
private property <SettingCamera> cache-setting;
32+
private property cache-setting <=> Store.camera-setting-cache;
3333
private property <bool> is-camera-playing: true;
3434

3535
public function get() -> SettingCamera {
@@ -113,8 +113,8 @@ export component CameraSettingDialog inherits Dialog {
113113
y: clamp(camera-img.y + camera-img.height * cache-setting.rect-cropping-y, camera-img.y, camera-img.y + camera-img.height - self.height);
114114
width: camera-img.width * cache-setting.rect-cropping-width / camera-img.source.width;
115115
height: camera-img.height * cache-setting.rect-cropping-height / camera-img.source.height;
116-
border-width: cache-setting.border-size * 1px;
117-
border-color: Store.camera-cropping-area-border-colors[cache-setting.border-color-index];
116+
border-width: 2px;
117+
border-color: white;
118118

119119
TouchArea {
120120
mouse-cursor: move;
@@ -135,8 +135,8 @@ export component CameraSettingDialog inherits Dialog {
135135
width: camera-img.width * cache-setting.circle-cropping-radius / camera-img.source.width;
136136
height: self.width;
137137
border-radius: self.width / 2;
138-
border-width: cache-setting.border-size * 1px;
139-
border-color: Store.camera-cropping-area-border-colors[cache-setting.border-color-index];
138+
border-width: 2px;
139+
border-color: white;
140140

141141
TouchArea {
142142
mouse-cursor: move;
@@ -187,7 +187,7 @@ export component CameraSettingDialog inherits Dialog {
187187
TouchArea {
188188
clicked => {
189189
is-camera-playing = true;
190-
Logic.camera-setting-dialog-start-playing(Store.setting-control.camera, cache-setting);
190+
Logic.camera-setting-dialog-start-playing(Store.setting-control.camera);
191191
}
192192
}
193193
}

wayshot/ui/store.slint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ export global Store {
352352
in-out property <SettingPushStream> setting-push-stream;
353353

354354
in-out property <bool> is-show-camera-setting-dialog: true;
355+
in-out property <SettingCamera> camera-setting-cache;
355356
in-out property <image> camera-setting-dialog-image: @image-url("./images/png/brand.png");
356357
in-out property <[color]> camera-cropping-area-border-colors: [
357358
Colors.white,

0 commit comments

Comments
 (0)