sd-webui/stable-diffusion-webui
1
1
Fork 0
mirror of https://github.com/sd-webui/stable-diffusion-webui.git synced 2024-12-14 23:02:00 +03:00
Code Issues Projects Releases Wiki Activity

squashed bug in canvas(flet ui)

Browse Source
This commit is contained in:
aedh carrick 2022-12-18 18:19:41 -06:00
parent 3f8ab89d7c
commit eefb4de6ce
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webui/flet/scripts/flet_canvas.py
View File

@ -40,6 +40,7 @@ class Canvas(ft.Container):
def add_layer_image(self, image):
self.image_stack.add_layer_image(image)
self.update()
def center_canvas(self, e):
width, height = self.page.get_viewport_size()
@ -51,18 +52,18 @@ class Canvas(ft.Container):
def align_canvas(self, e):
width, height = self.page.get_viewport_size()
self.image_stack.left = (width * 0.5) - (self.image_stack.scaled_width * 0.5) + self.image_stack.offset_x
self.image_stack.top = (height * 0.5) - (self.image_stack.scaled_height * 0.5) + self.image_stack.offset_y
self.image_stack.left = (width * 0.5) - (self.image_stack.width * 0.5) + self.image_stack.offset_x
self.image_stack.top = (height * 0.5) - (self.image_stack.height * 0.5) + self.image_stack.offset_y
self.update()
def pan_canvas(self, e: ft.DragUpdateEvent):
self.image_stack.offset_x += e.delta_x
self.image_stack.offset_y += e.delta_y
width, height = self.page.get_viewport_size()
self.image_stack.offset_x = max(self.image_stack.offset_x, (width - self.image_stack.scaled_width) * 0.5)
self.image_stack.offset_y = max(self.image_stack.offset_y, (height - self.image_stack.scaled_height) * 0.5)
self.image_stack.offset_x = min(self.image_stack.offset_x, (self.image_stack.scaled_width - width) * 0.5)
self.image_stack.offset_y = min(self.image_stack.offset_y, (self.image_stack.scaled_height - height) * 0.5)
self.image_stack.offset_x = max(self.image_stack.offset_x, (width - self.image_stack.width) * 0.5)
self.image_stack.offset_y = max(self.image_stack.offset_y, (height - self.image_stack.height) * 0.5)
self.image_stack.offset_x = min(self.image_stack.offset_x, (self.image_stack.width - width) * 0.5)
self.image_stack.offset_y = min(self.image_stack.offset_y, (self.image_stack.height - height) * 0.5)
self.align_canvas(e)
def zoom_in(self, e):
@ -110,7 +111,7 @@ class ImageStack(ft.Container):
width = image.width,
height = image.height,
content = ft.Image(
src_base64 = flet_utils.convert_image_to_base64(image),
src = f'assets/uploads/{image.filename}',
width = image.width,
height = image.height,
gapless_playback = True,

5
webui/flet/webui_flet.py
View File

@ -2,11 +2,12 @@
import flet as ft
# other imports
import os
from math import pi
from typing import Optional
from loguru import logger
import logging
#logging.basicConfig(level=logging.DEBUG)
logging.basicConfig(level=logging.DEBUG)
# utils imports
from scripts import flet_utils
@ -23,6 +24,8 @@ from scripts.flet_property_manager import property_manager
# for debugging
from pprint import pprint
os.environ["FLET_WS_MAX_MESSAGE_SIZE"] = "8000000"
# main ###############################################################
@logger.catch(reraise=True)