cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

history warning, overlay model fixes, new zoom system beginnings #445

Merged
sarah merged 6 commits from historywarning into master 2020-12-09 01:13:19 +00:00
Conversation 3 Commits 6 Files Changed 20 +434 -134
erinn commented 2020-12-09 00:39:17 +00:00
Owner
Copy Link
No description provided.
buildbot commented 2020-12-09 00:43:10 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/ui/912

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/912
sarah reviewed 2020-12-09 00:48:03 +00:00
go/ui/messagemodel.go Outdated
@ -5,2 +5,4 @@
"cwtch.im/ui/go/the"
"encoding/hex"
//"encoding/hex"
sarah commented 2020-12-09 00:39:57 +00:00
Owner

delete

delete
go/ui/messagemodel.go
@ -146,0 +153,4 @@
mw.SetPeerID(modelmsg.PeerID)
mw.SetError(modelmsg.Error)
mw.SetAcknowledged(ackd)
mw.SetAckd(ackd)//??why both??
sarah commented 2020-12-09 00:42:47 +00:00
Owner

I beleive this disinguishes outbound messages that have been acked with inbound messages that we have acked.

I beleive this disinguishes outbound messages that have been acked with inbound messages that we have acked.
qml/overlays/ChatOverlay.qml
@ -84,3 +138,3 @@
color: Theme.backgroundMainColor
width: parent.width
height: texmet.height + 6 + 12 * gcd.themeScale
height: texmet.height + 6 + 12// * gcd.themeScale
sarah commented 2020-12-09 00:47:06 +00:00
Owner

does this need to scale?

does this need to scale?
erinn commented 2020-12-09 01:00:11 +00:00
Author
Owner

technically but this fixes image scaling for now... i'm planning to 'grep -r themeScale' for the new zoom system so we'll fix it then

technically but this fixes image scaling for now... i'm planning to 'grep -r themeScale' for the new zoom system so we'll fix it then
qml/overlays/ChatOverlay.qml
@ -128,1 +182,4 @@
}
onSupplyPeerSettings: function(onion, nick, authorization, saveHistory) {
overlayRoot.historyState = saveHistory
sarah commented 2020-12-09 00:47:47 +00:00
Owner

I'd like to see a qml check on onion == handle here even if the logic is also being handled by the gcd

I'd like to see a qml check on onion == handle here even if the logic is also being handled by the gcd
erinn marked this conversation as resolved
buildbot commented 2020-12-09 00:53:12 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/ui/914

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/914
erinn changed title from WIP: history warning, overlay model fixes, new zoom system beginnings to history warning, overlay model fixes, new zoom system beginnings 2020-12-09 00:59:12 +00:00
buildbot commented 2020-12-09 01:02:02 +00:00
Member
Copy Link

Drone Build Status: success

https://build.openprivacy.ca/cwtch.im/ui/916

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/916
sarah merged commit 4d927c133d into master 2020-12-09 01:13:18 +00:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
Labels
Clear labels   
1app

   
2 apps

   
accessibility

   
android

   
before-beta

issues that need to be fixed before beta

  
bug

   
duplicate

   
enhancement

   
first-contact

   
fixed

   
help wanted

   
infrastructure

   
invalid

   
low-priority

   
must-fix

   
needs testing

issues that are presumed fixed but need testing

  
nice-to-have

   
question

   
tor

   
user-feedback

   
wontfix
No Label
1app
2 apps
accessibility
android
before-beta
bug
duplicate
enhancement
first-contact
fixed
help wanted
infrastructure
invalid
low-priority
must-fix
needs testing
nice-to-have
question
tor
user-feedback
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: cwtch.im/ui#445
No description provided.
Delete Branch "historywarning"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?