diff --git a/game/gui/creamy_pumpkin_pie/scrollbar_vertical_idle_bar.png b/game/gui/creamy_pumpkin_pie/scrollbar_vertical_idle_bar.png new file mode 100644 index 00000000..6928a6c5 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/scrollbar_vertical_idle_bar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77882d5d2ed82094cc77768380f4b7d759afdea21b38ec131252466cfb9c6c1f +size 12103 diff --git a/game/gui/creamy_pumpkin_pie/scrollbar_vertical_idle_thumb.png b/game/gui/creamy_pumpkin_pie/scrollbar_vertical_idle_thumb.png new file mode 100644 index 00000000..b823e492 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/scrollbar_vertical_idle_thumb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e279e2225b8d504247a565bf8179f2e726c43e40997e483576f31dc22916a47 +size 2974 diff --git a/game/scripts/gui/_images_.rpy b/game/scripts/gui/_images_.rpy index e792c4b8..07baf837 100644 --- a/game/scripts/gui/_images_.rpy +++ b/game/scripts/gui/_images_.rpy @@ -211,18 +211,28 @@ image scrollbar_horizontal_selected_hover_bar = "scrollbar_horizontal_hover_bar" image scrollbar_horizontal_insensitive_bar = "scrollbar_horizontal_idle_bar" image scrollbar_horizontal_selected_insensitive_bar = "scrollbar_horizontal_idle_bar" -image scrollbar_vertical_idle_thumb = "gui/scrollbar/horizontal_idle_bar.png" #Solid("#3d3535") -image scrollbar_vertical_insensitive_thumb = "gui/scrollbar/horizontal_idle_bar.png" -image scrollbar_vertical_selected_idle_thumb = "scrollbar_vertical_idle_thumb" -image scrollbar_vertical_selected_insensitive_thumb = "scrollbar_vertical_idle_thumb" -image scrollbar_vertical_hover_thumb = image_hover("gui/scrollbar/horizontal_idle_bar.png") #Solid("#3d3535") -image scrollbar_vertical_selected_hover_thumb = "scrollbar_vertical_hover_thumb" -image scrollbar_vertical_idle_bar = Solid("#726363") -image scrollbar_vertical_selected_idle_bar = "scrollbar_vertical_idle_bar" -image scrollbar_vertical_hover_bar = Solid("#726363") -image scrollbar_vertical_selected_hover_bar = "scrollbar_vertical_hover_bar" -image scrollbar_vertical_insensitive_bar = "scrollbar_vertical_idle_bar" -image scrollbar_vertical_selected_insensitive_bar = "scrollbar_horizontal_idle_bar" +image scrollbar_vertical_idle_thumb = Frame(Image("gui/creamy_pumpkin_pie/scrollbar_vertical_idle_thumb.png", oversample=4), 0, 20) +image scrollbar_vertical_hover_thumb = At(Frame(Image("gui/creamy_pumpkin_pie/scrollbar_vertical_idle_thumb.png", oversample=4), 0, 20), scrollbar_vertical_thumb_hover) +# image scrollbar_vertical_insensitive_thumb = "scrollbar_vertical_idle_thumb" +# image scrollbar_vertical_selected_idle_thumb = "scrollbar_vertical_idle_thumb" +# image scrollbar_vertical_selected_insensitive_thumb = "scrollbar_vertical_idle_thumb" +# image scrollbar_vertical_hover_thumb = image_hover("scrollbar_vertical_idle_thumb") +# image scrollbar_vertical_selected_hover_thumb = "scrollbar_vertical_hover_thumb" +image scrollbar_vertical_idle_bar = Frame(Image("gui/creamy_pumpkin_pie/scrollbar_vertical_idle_bar.png", oversample=4), 0, 40) +# image scrollbar_vertical_selected_idle_bar = "scrollbar_vertical_idle_bar" +# image scrollbar_vertical_hover_bar = "scrollbar_vertical_idle_bar" +# image scrollbar_vertical_selected_hover_bar = "scrollbar_vertical_hover_bar" +# image scrollbar_vertical_insensitive_bar = "scrollbar_vertical_idle_bar" +# image scrollbar_vertical_selected_insensitive_bar = "scrollbar_vertical_idle_bar" + +transform scrollbar_vertical_thumb_hover: + subpixel True + yzoom 1.0 + yanchor 0.5 + easein 0.2 yzoom 1.1 + easeout 0.2 yzoom 1.0 + pause 1 + repeat diff --git a/game/scripts/gui/_styles_.rpy b/game/scripts/gui/_styles_.rpy index bf9414b4..8a9a15d3 100644 --- a/game/scripts/gui/_styles_.rpy +++ b/game/scripts/gui/_styles_.rpy @@ -78,9 +78,14 @@ style scrollbar: style vscrollbar: unscrollable gui.unscrollable - xsize gui.scrollbar_size - base_bar Frame("scrollbar_vertical_[prefix_]bar", gui.slider_borders, tile=gui.slider_tile) - thumb Frame("scrollbar_vertical_[prefix_]thumb", gui.slider_borders, tile=gui.slider_tile) + xsize 22 + xmargin 4 + base_bar "scrollbar_vertical_idle_bar" + thumb "scrollbar_vertical_idle_thumb" + hover_thumb "scrollbar_vertical_hover_thumb" + thumb_offset 4 + top_gutter 27 + bottom_gutter 27 hover_sound "sounds/qubodup-hover1.ogg" activate_sound "sounds/qubodup-click2.ogg" mouse "button" diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy index 83cd4367..50736650 100644 --- a/game/scripts/gui/say.rpy +++ b/game/scripts/gui/say.rpy @@ -30,7 +30,7 @@ screen say(who, what, side_doll=None, side_image=None, icon=None): if not is_game_menu(): # Allows dialogues to function inside interface elements - # add "gui_fade_bottom" + add "gui_fade_bottom" use invisible_button(Return(), keysym="dismiss") if states.settings.interface_hidden: diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index d7c9b69d..7f7cd1fd 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -486,7 +486,7 @@ screen wardrobe(): # Outfit List vpgrid: cols 5 - spacing 5 + spacing 4 mousewheel True scrollbars "vertical" @@ -541,8 +541,8 @@ screen wardrobe(): vpgrid: cols 5 ysize 399 - xspacing 5 - yspacing 5 + xspacing 4 + yspacing 4 mousewheel True scrollbars "vertical" for item in character.wardrobe[selected_category][selected_subcategory]: