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

new scaling system pass one #457

Open
erinn wants to merge 4 commits from newzoom into master
pull from: newzoom
merge into: cwtch.im:master
Conversation 8 Commits 4 Files Changed 35 +1713 -1523
erinn commented 2020-12-15 01:23:06 +00:00
Owner
Copy Link

needs opaque merged first

needs opaque merged first
buildbot commented 2020-12-15 01:26:19 +00:00
Member
Copy Link

Drone Build Status: success

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

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/951
dan requested changes 2020-12-15 22:26:44 +00:00
dan left a comment
Owner

I'll need to download and test the MyProfile changes. I thought the reason I had a function there was QML basically said doing anything complex with just properties is undefiend so for changes like we want there do it with an ugly function

I'll need to download and test the MyProfile changes. I thought the reason I had a function there was QML basically said doing anything complex with just properties is undefiend so for changes like we want there do it with an ugly function
qml/overlays/ListOverlay.qml Outdated
@ -62,3 +55,1 @@
font.pixelSize: 18 * gcd.themeScale
text: qsTr("peer-not-online")
}
// Label {
dan commented 2020-12-15 22:13:42 +00:00
Owner

This shouldn't be commented out

This shouldn't be commented out
erinn marked this conversation as resolved
qml/panes/GroupSettingsPane.qml Outdated
@ -78,3 +77,3 @@
Opaque.Setting {
property color backgroundColor: parent.color
property color backgroundColor: "red"//parent.color
dan commented 2020-12-15 22:14:12 +00:00
Owner

undebug :)

undebug :)
erinn marked this conversation as resolved
qml/panes/OverlayPane.qml Outdated
@ -46,3 +47,2 @@
ChatOverlay { //0
Layout.maximumHeight: overlayStack.height
Layout.maximumWidth: overlayStack.width
// Layout.maximumHeight: overlayStack.height
dan commented 2020-12-15 22:14:32 +00:00
Owner

if we don't need them then we should delete?

if we don't need them then we should delete?
erinn marked this conversation as resolved
qml/panes/ProfileAddEditPane.qml Outdated
@ -367,3 +366,3 @@
Opaque.Button { // ADD or SAVE button
height: Theme.primaryTextSize * 1.5
//height: Theme.primaryTextSize * 1.5
dan commented 2020-12-15 22:15:34 +00:00
Owner

switch to new textSize?

switch to new textSize?
erinn commented 2020-12-17 03:21:23 +00:00
Author
Owner

it calculates its own height

it calculates its own height
erinn marked this conversation as resolved
qml/panes/ProfileManagerPane.qml Outdated
@ -38,3 +36,3 @@
RowLayout {
width: 700 * gcd.themeScale
//width: 700 * gcd.themeScale
dan commented 2020-12-15 22:16:03 +00:00
Owner

I think this did need a min size of some kind?

I think this did need a min size of some kind?
erinn commented 2020-12-17 03:23:00 +00:00
Author
Owner

maybe an android thing?

maybe an android thing?
erinn marked this conversation as resolved
qml/panes/ProfileManagerPane.qml Outdated
@ -46,3 +44,2 @@
//Layout.fillWidth: true
Layout.maximumWidth: 450 * gcd.themeScale
Layout.minimumWidth: 450 * gcd.themeScale
//Layout.maximumWidth: 450 * gcd.themeScale
dan commented 2020-12-15 22:16:19 +00:00
Owner

delete?

delete?
erinn marked this conversation as resolved
qml/panes/ServerAddEditPane.qml Outdated
@ -56,1 +54,3 @@
serverAddEditPane.server_available = !serverAddEditPane.server_available
checked: serverAddEditPane.server_available
onCheckedChanged: function() {
//serverAddEditPane.server_available = !serverAddEditPane.server_available
dan commented 2020-12-15 22:16:55 +00:00
Owner

uncomment

uncomment
erinn marked this conversation as resolved
qml/panes/ServerAddEditPane.qml Outdated
@ -80,1 +78,3 @@
serverAddEditPane.autostart_server = !serverAddEditPane.autostart_server
checked: serverAddEditPane.autostart_server
onCheckedChanged: function() {
//serverAddEditPane.autostart_server = !serverAddEditPane.autostart_server
dan commented 2020-12-15 22:17:13 +00:00
Owner

uncomment

uncomment
erinn marked this conversation as resolved
qml/panes/ServerInfoPane.qml Outdated
@ -71,3 +68,1 @@
// TODO: Actually do something with these keys
console.log("FOUND SERVER KEY " + key_names[i] + " " + keys[i]);
}
// console.log("Servers: " + key_names);
dan commented 2020-12-15 22:17:34 +00:00
Owner

delete :)

delete :)
erinn marked this conversation as resolved
qml/panes/SettingsPane.qml Outdated
@ -80,2 +75,2 @@
value: gcd.themeScale
live: false
from: 0
to: 4
dan commented 2020-12-15 22:18:47 +00:00
Owner

if there's only 3 vals? with a step size of 1, should it' be 0 to 2 inclusive?

if there's only 3 vals? with a step size of 1, should it' be 0 to 2 inclusive?
erinn commented 2020-12-17 03:27:43 +00:00
Author
Owner

from Theme.qml:

// magnification system: all size-sets should generally respect these semantics:
//
// scale
// 0 1 2 3 4
// padding S M M M L
// text S S M L L
//
// use the syntax "propertyName: propertyNameBase[p[scale]]" for padding that
// has S/M/L granularity (and likewise t[scale] for text)
// use the syntax "propertyName: propertyNameBase[scale]" for things that you
// would prefer have 0/1/2/3/4 granularity.

from Theme.qml: > // magnification system: all size-sets should generally respect these semantics: > // > // scale > // 0 1 2 3 4 > // padding S M M M L > // text S S M L L > // > // use the syntax "propertyName: propertyNameBase[p[scale]]" for padding that > // has S/M/L granularity (and likewise t[scale] for text) > // use the syntax "propertyName: propertyNameBase[scale]" for things that you > // would prefer have 0/1/2/3/4 granularity.
erinn marked this conversation as resolved
qml/panes/SettingsPane.qml
@ -172,0 +155,4 @@
experiment_id: "tapir-groups-experiment"
}
Opaque.Collapser {
dan commented 2020-12-15 22:19:59 +00:00
Owner

shouldn't this be outside experiments?

shouldn't this be outside experiments?
erinn commented 2020-12-17 03:28:18 +00:00
Author
Owner

that would be lovely but ToggleFields can't go in Collapsers for some reason currently lmao

that would be lovely but ToggleFields can't go in Collapsers for some reason currently lmao
erinn marked this conversation as resolved
qml/panes/SettingsPane.qml
@ -172,0 +222,4 @@
}
Opaque.Label {
text: "dependencies, licenses?\nprofile icon pics\nfontawesome? other icon sources?\nmutant standard\nadobe blank\nopensans?"
dan commented 2020-12-15 22:20:37 +00:00
Owner

possible lokalise too?

possible lokalise too?
erinn commented 2020-12-17 03:29:03 +00:00
Author
Owner

absolutely. and split up by bullet point so we can add/remove individual entries easily. soon!

absolutely. and split up by bullet point so we can add/remove individual entries easily. soon!
erinn marked this conversation as resolved
qml/widgets/ProfileRow.qml Outdated
@ -105,3 +105,3 @@
iconColor: Theme.altTextColor
anchors.verticalCenter: parent.verticalCenter
//anchors.verticalCenter: parent.verticalCenter
dan commented 2020-12-15 22:25:29 +00:00
Owner

delete?

delete?
erinn marked this conversation as resolved
qml/widgets/ServerList.qml Outdated
@ -75,3 +67,1 @@
onResetServerList: function() {
serversModel.clear()
}
// onResetServerList: function() {
dan commented 2020-12-15 22:25:48 +00:00
Owner

uncomment?

uncomment?
erinn commented 2020-12-17 03:30:08 +00:00
Author
Owner

never gets called

never gets called
erinn marked this conversation as resolved
buildbot commented 2020-12-17 03:34:39 +00:00
Member
Copy Link

Drone Build Status: success

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

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/961
buildbot commented 2020-12-17 03:42:09 +00:00
Member
Copy Link

Drone Build Status: failure

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

Drone Build Status: failure https://build.openprivacy.ca/cwtch.im/ui/963
erinn changed title from wip: new scaling system pass one to new scaling system pass one 2020-12-17 03:42:21 +00:00
buildbot commented 2020-12-17 03:48:13 +00:00
Member
Copy Link

Drone Build Status: success

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

Drone Build Status: success https://build.openprivacy.ca/cwtch.im/ui/965
dan commented 2020-12-17 06:02:03 +00:00
Owner
Copy Link

looks like all my comments are addressed. I would like to check it out and try it before final approval

looks like all my comments are addressed. I would like to check it out and try it before final approval
dan commented 2020-12-17 07:10:00 +00:00
Owner
Copy Link

Left is newzoom, right is master

  • 1: open a profile
  • 2: open a chat when its wide enough for dual pane mode
  • 3: 'back' to close the chat
  • 4: i think open a chat, widen it more, close, open

some obscure part of QML docs warned that trying to do dynamic position changes with properties only was out of scope and unsupported hence I started using functions. you may want to restore and adapt the function, as hideous as it is, I had here

Left is newzoom, right is master - 1: open a profile - 2: open a chat when its wide enough for dual pane mode - 3: 'back' to close the chat - 4: i think open a chat, widen it more, close, open some obscure part of QML docs warned that trying to do dynamic position changes with properties only was out of scope and unsupported hence I started using functions. you may want to restore and adapt the function, as hideous as it is, I had here
cwtch scale 1.png
233 KiB
cwtch scale 2.png
222 KiB
cwtch scale 3.png
215 KiB
cwtch scale 4.png
124 KiB
cwtch scale 1.png cwtch scale 2.png cwtch scale 3.png cwtch scale 4.png
dan commented 2020-12-17 07:11:28 +00:00
Owner
Copy Link
  • way too much padding between MyProfile and the search bar on contactList
  • since the text magnification reference is in a collapser, do we want it in the zoom level area?
  • it's a nit but I think the profile name and onion are padded too far from the profile icon?
  • password entry field I think needs to be longer
  • the icons in the toolbar on top dont seem to be scaling quite along with the toolbar's overall size, so at higher magnifications they appear to be small icons floating in space
- way too much padding between MyProfile and the search bar on contactList - since the text magnification reference is in a collapser, do we want it in the zoom level area? - it's a nit but I think the profile name and onion are padded too far from the profile icon? - password entry field I think needs to be longer - the icons in the toolbar on top dont seem to be scaling quite along with the toolbar's overall size, so at higher magnifications they appear to be small icons floating in space
dan commented 2020-12-17 07:44:39 +00:00
Owner
Copy Link
  • Makefile has -docker for linux
- Makefile has -docker for linux
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
dan
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#457
No description provided.
Delete Branch "newzoom"

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?