OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
sdottaka [Sun, 21 Sep 2014 04:38:08 +0000 (04:38 +0000)]
README.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:18:25 +0000 (04:18 +0000)]
README.md edited online with Bitbucket
sdottaka [Sun, 21 Sep 2014 04:04:55 +0000 (13:04 +0900)]
Add an image merge feature
sdottaka [Sun, 21 Sep 2014 03:55:34 +0000 (12:55 +0900)]
Add BuildBin.cmd and its dependencies
sdottaka [Tue, 16 Sep 2014 10:43:17 +0000 (19:43 +0900)]
- Fix some cppcheck warnings
- Improve zoom
sdottaka [Mon, 15 Sep 2014 15:09:54 +0000 (00:09 +0900)]
WinIMergeLib: Add new member functions as listed below:
virtual int GetPaneCount() const = 0;
virtual RECT GetPaneWindowRect(int pane) const = 0;
virtual RECT GetWindowRect() const = 0;
virtual COLORREF GetDiffColor() const = 0;
virtual void SetDiffColor(COLORREF clrDiffColor) = 0;
virtual COLORREF GetSelDiffColor() const = 0;
virtual void SetSelDiffColor(COLORREF clrSelDiffColor) = 0;
virtual double GetDiffColorAlpha() const = 0;
virtual void SetDiffColorAlpha(double diffColorAlpha) = 0;
virtual int GetConflictCount() const = 0;
virtual bool SelectDiff(int diffIndex) = 0;
virtual int GetNextDiffIndex() const = 0;
virtual int GetPrevDiffIndex() const = 0;
virtual int GetNextConflictIndex() const = 0;
virtual int GetPrevConflictIndex() const = 0;
virtual HWND GetPaneHWND(int pane) const = 0;
virtual int GetImageWidth(int pane) const = 0;
virtual int GetImageHeight(int pane) const = 0;
virtual int GetImageBitsPerPixel(int pane) const = 0;
sdottaka [Fri, 12 Sep 2014 10:19:47 +0000 (19:19 +0900)]
* WinIMergeLib: Add GetActivePane(), SetActivePane(),
FirstConflict(),
LastConflict(), NextConflict(), PrevConflict(),
AddEventListener()
* WinIMergeLib: Draw focus rectangle
* WinIMerge: Add context menu
* WinIMerge: Add "Next Conflict", "Previous conflict" menu item
sdottaka [Thu, 11 Sep 2014 00:52:24 +0000 (09:52 +0900)]
Initial import
OSDN Git Service
