amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scroll issues; text no longer overlaps on package lists (still truncated, but this at least is better)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1287 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2009-01-02 23:00:25 +00:00
parent 46dda0ef30
commit 697bfc3e7e
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/native_look_editor.cpp
+4 -3
View File
@@ -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();
}
}
src/gui/control/package_list.cpp
+3 -1
View File
@@ -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 {