use extended Group instead of property #23
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I think you could use a property to have |
|
I think this is ready to go now. I have added a |
tannewt
requested changes
Aug 12, 2020
adafruit_button.py
Outdated
Comment on lines
199
to
200
| self._label.x = 0 + (self.width - dims[2]) // 2 | ||
| self._label.y = 0 + self.height // 2 |
There was a problem hiding this comment.
Suggested change
| self._label.x = 0 + (self.width - dims[2]) // 2 | |
| self._label.y = 0 + self.height // 2 | |
| self._label.x = (self.width - dims[2]) // 2 | |
| self._label.y = self.height // 2 |
I think these zeroes will be confusing going forwards.
adafruit_button.py
Outdated
| width - 2, | ||
| height - 2, | ||
| fill=self.fill_color, | ||
| outline=self.outline_color, | ||
| ) | ||
| elif style == Button.SHADOWROUNDRECT: | ||
| self.shadow = RoundRect( | ||
| x + 2, y + 2, width - 2, height - 2, r=10, fill=self.outline_color | ||
| 0 + 2, 0 + 2, width - 2, height - 2, r=10, fill=self.outline_color |
There was a problem hiding this comment.
Suggested change
| 0 + 2, 0 + 2, width - 2, height - 2, r=10, fill=self.outline_color | |
| 2, 2, width - 2, height - 2, r=10, fill=self.outline_color |
adafruit_button.py
Outdated
| @@ -148,32 +147,32 @@ def __init__( | |||
| ) | |||
| elif style == Button.SHADOWRECT: | |||
| self.shadow = Rect( | |||
| x + 2, y + 2, width - 2, height - 2, fill=outline_color | |||
| 0 + 2, 0 + 2, width - 2, height - 2, fill=outline_color | |||
There was a problem hiding this comment.
Suggested change
| 0 + 2, 0 + 2, width - 2, height - 2, fill=outline_color | |
| 2, 2, width - 2, height - 2, fill=outline_color |
|
Latest commit removes the usage of extra zeros in the calculations. |
This was referenced Aug 14, 2020
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Aug 17, 2020
Updating https://github.com/adafruit/Adafruit_CircuitPython_Display_Button to 1.4.0 from 1.3.4: > Merge pull request adafruit/Adafruit_CircuitPython_Display_Button#23 from FoamyGuy/use_extended_group Updating https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation to 2.4.1 from 2.4.0: > Merge pull request adafruit/Adafruit_CircuitPython_LED_Animation#63 from rhooper/refactor-to-ms
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the beginning of a resolution for the issue raised by #22 .
I have done basic testing with a slightly modified simpletest and it seems to be working as intended so far. It does need some more thorough testing though. And the example scripts should be updated to use the the API without accessing
groupproperty.However in making these changes and testing them out I got to thinking about the ramifications a bit more. This change as it is now breaks any existing user code that uses the button since the
groupproperty will no longer exist.Maybe it would be good to provide backwards compatibility for some time by returning the correct thing from a
groupproperty along with printing a deprecation warning message?I will work on getting this tested more and updating the examples this week. I wanted to get this PR created to see if anyone else has thoughts about making this change and/or the deprecation considerations.