Skip to content

Migrate ColorPicker to Flet 0.80 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pynajy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate ColorPicker to Flet 0.80 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions flet_contrib/color_picker/src/color_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def __move_circle(x, y):
self.update_selected_color_view_values()

def on_pan_update(e: ft.DragStartEvent):
__move_circle(x=e.local_x, y=e.local_y)
__move_circle(x=e.local_position.x, y=e.local_position.y)
self.selected_color_view.update()
self.thumb.update()

Expand All @@ -177,8 +177,8 @@ def on_pan_update(e: ft.DragStartEvent):

saturation_container = ft.Container(
gradient=ft.LinearGradient(
begin=ft.alignment.center_left,
end=ft.alignment.center_right,
begin=ft.alignment.Alignment.CENTER_LEFT,
end=ft.alignment.Alignment.CENTER_RIGHT,
colors=[ft.Colors.WHITE, ft.Colors.RED],
),
width=self.color_map_container.content.width - CIRCLE_SIZE,
Expand All @@ -192,8 +192,8 @@ def on_pan_update(e: ft.DragStartEvent):
content=saturation_container,
blend_mode=ft.BlendMode.MULTIPLY,
shader=ft.LinearGradient(
begin=ft.alignment.top_center,
end=ft.alignment.bottom_center,
begin=ft.alignment.Alignment.TOP_CENTER,
end=ft.alignment.Alignment.BOTTOM_CENTER,
colors=[ft.Colors.WHITE, ft.Colors.BLACK],
),
border_radius=5,
Expand Down
8 changes: 4 additions & 4 deletions flet_contrib/color_picker/src/hue_slider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ def update_selected_hue(self, x):
self.on_change_hue()

def drag_start(self, e: ft.DragStartEvent):
self.update_selected_hue(x=e.local_x)
self.update_selected_hue(x=e.local_position.x)

def drag_update(self, e: ft.DragUpdateEvent):
self.update_selected_hue(x=e.local_x)
self.update_selected_hue(x=e.local_position.x)

def generate_gradient_colors(self):
colors = []
Expand All @@ -65,8 +65,8 @@ def generate_gradient_colors(self):
def generate_slider(self):
self.track = ft.Container(
gradient=ft.LinearGradient(
begin=ft.alignment.center_left,
end=ft.alignment.center_right,
begin=ft.alignment.Alignment.CENTER_LEFT,
end=ft.alignment.Alignment.CENTER_RIGHT,
colors=self.generate_gradient_colors(),
),
width=SLIDER_WIDTH - CIRCLE_SIZE,
Expand Down