diff --git a/src/gui/control/native_look_editor.cpp b/src/gui/control/native_look_editor.cpp index 933a38ff..34a81e53 100644 --- a/src/gui/control/native_look_editor.cpp +++ b/src/gui/control/native_look_editor.cpp @@ -145,7 +145,7 @@ void NativeLookEditor::onScroll(wxScrollWinEvent& ev) { y = y - page; } else if (ev.GetEventType() == wxEVT_SCROLLWIN_PAGEDOWN) { y = y + page; - } else if (ev.GetEventType() == wxEVT_SCROLLWIN_THUMBTRACK || + } else if (ev.GetEventType() == wxEVT_SCROLLWIN_THUMBTRACK || ev.GetEventType() == wxEVT_SCROLLWIN_THUMBRELEASE) { y = ev.GetPosition(); } @@ -177,14 +177,15 @@ void NativeLookEditor::scrollTo(int direction, int pos) { pos = max(0, min(bottom, pos)); if (pos != y) { SetScrollPos(wxVERTICAL, pos); + // move child controls FOR_EACH(v, viewers) { ValueEditor* e = v->getEditor(); if (e) e->determineSize(); } - // redraw - onChange(); } + // redraw + onChange(); } } diff --git a/src/gui/control/package_list.cpp b/src/gui/control/package_list.cpp index e677359e..976d28c8 100644 --- a/src/gui/control/package_list.cpp +++ b/src/gui/control/package_list.cpp @@ -18,7 +18,7 @@ DECLARE_TYPEOF_COLLECTION(PackagedP); PackageList::PackageList(Window* parent, int id, int direction, bool always_focused) : GalleryList(parent, id, direction, always_focused) { - item_size = subcolumns[0].size = wxSize(108, 150); + item_size = subcolumns[0].size = wxSize(125, 150); SetThemeEnabled(true); } @@ -27,6 +27,7 @@ size_t PackageList::itemCount() const { } void PackageList::drawItem(DC& dc, int x, int y, size_t item) { + dc.SetClippingRegion(x, y, item_size.x, item_size.y); PackageData& d = packages.at(item); RealRect rect(RealPoint(x,y),item_size); RealPoint pos; @@ -45,6 +46,7 @@ void PackageList::drawItem(DC& dc, int x, int y, size_t item) { dc.GetTextExtent(d.package->full_name, &w, &h); RealPoint text_pos = align_in_rect(ALIGN_CENTER, RealSize(w,h), rect); dc.DrawText(d.package->full_name, (int)text_pos.x, (int)text_pos.y + 130); + dc.DestroyClippingRegion(); } struct PackageList::ComparePackagePosHint { diff --git a/tools/linux-installer/install b/tools/linux-installer/install index 0741eaec..9a1b5458 100755 --- a/tools/linux-installer/install +++ b/tools/linux-installer/install @@ -13,8 +13,8 @@ case $UID in INSTALL_DIR='/usr/local/share/magicseteditor/'; EXEC_SYMLINK='/usr/local/bin/magicseteditor';; *) - INSTALL_DIR=~'/.magicseteditor/'; - EXEC_SYMLINK=~'/bin/magicseteditor'; + INSTALL_DIR='$HOME/.magicseteditor/'; + EXEC_SYMLINK='$HOME/bin/magicseteditor'; esac if [ \"$MSE_INSTALL_DIR\" != "" ] then