huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-19 01:29:49 +00:00
Code Issues Wiki Activity

Fix palette swatch highlight not being shown

Browse source
This commit is contained in:
Emmanouil Papadeas 2023-12-23 21:44:38 +02:00
parent 06b405dae8
commit 165217acc3
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Palette/PaletteGrid.gd
View file

@ -69,8 +69,8 @@ func draw_palette() -> void:
var grid_index := i + grid_size.x * j var grid_index := i + grid_size.x * j
var index := convert_grid_index_to_palette_index(grid_index) var index := convert_grid_index_to_palette_index(grid_index)
var swatch := swatches[grid_index] var swatch := swatches[grid_index]
swatch.show_left_highlight = false swatch.show_left_highlight = Palettes.left_selected_color == index
swatch.show_right_highlight = false swatch.show_right_highlight = Palettes.right_selected_color == index
var color = current_palette.get_color(index) var color = current_palette.get_color(index)
if color != null: if color != null:
swatch.color = color swatch.color = color

4
src/Palette/PaletteScroll.gd
View file

@ -81,10 +81,12 @@ func _on_PaletteScroll_gui_input(event: InputEvent) -> void:
palette_grid.change_swatch_size(Vector2i.ONE) palette_grid.change_swatch_size(Vector2i.ONE)
else: else:
scroll_vector = Vector2i.LEFT if event.shift_pressed else Vector2i.UP scroll_vector = Vector2i.LEFT if event.shift_pressed else Vector2i.UP
if event.button_index == MOUSE_BUTTON_WHEEL_DOWN: elif event.button_index == MOUSE_BUTTON_WHEEL_DOWN:
if event.ctrl_pressed: if event.ctrl_pressed:
palette_grid.change_swatch_size(-Vector2i.ONE) palette_grid.change_swatch_size(-Vector2i.ONE)
else: else:
scroll_vector = Vector2i.RIGHT if event.shift_pressed else Vector2i.DOWN scroll_vector = Vector2i.RIGHT if event.shift_pressed else Vector2i.DOWN
else:
return
resize_grid() resize_grid()
set_sliders(palette_grid.current_palette, palette_grid.grid_window_origin + scroll_vector) set_sliders(palette_grid.current_palette, palette_grid.grid_window_origin + scroll_vector)

6
src/Palette/PaletteSwatch.gd
View file

@ -34,12 +34,12 @@ func set_swatch_size(swatch_size: Vector2) -> void:
func _draw() -> void: func _draw() -> void:
if not empty: if not empty:
# Black border around swatches with a color # Black border around swatches with a color
draw_rect(Rect2(Vector2.ZERO, size), Color.BLACK, false, 1) draw_rect(Rect2(Vector2.ONE, size), Color.BLACK, false, 1)
if show_left_highlight: if show_left_highlight:
# Display outer border highlight # Display outer border highlight
draw_rect(Rect2(Vector2.ZERO, size), Color.WHITE, false, 1) draw_rect(Rect2(Vector2.ONE, size), Color.WHITE, false, 1)
draw_rect(Rect2(Vector2.ONE, size - Vector2(2, 2)), Color.BLACK, false, 1) draw_rect(Rect2(Vector2(2, 2), size - Vector2(2, 2)), Color.BLACK, false, 1)
if show_right_highlight: if show_right_highlight:
# Display inner border highlight # Display inner border highlight