github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: designer issue #613

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6765 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-01-13 08:30:54 +00:00
parent 98a2020296
commit bc65762a69
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Draw/SImageDraw.cpp
View file

@ -33,10 +33,10 @@ SImageDraw::operator Image() const
{
ImageBuffer b(ib.GetSize());
memcpy(b, ib.Begin(), sizeof(RGBA) * ib.GetLength());
const RGBA *s = alpha.ib.Begin();
RGBA *t = b;
const RGBA *e = b.End();;
if(has_alpha) {
const RGBA *s = alpha.ib.Begin();
while(t < e) {
t->a = s->r;
t++;
@ -57,11 +57,13 @@ SImageDraw::operator Image() const
SImageDraw::SImageDraw(Size sz)
{
has_alpha = false;
SImageDraw1::Create(sz);
}
SImageDraw::SImageDraw(int cx, int cy)
{
has_alpha = false;
SImageDraw1::Create(Size(cx, cy));
}

BIN
uppsrc/ide/icon.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

8
uppsrc/ide/idebar.cpp
View file

@ -374,14 +374,14 @@ void Ide::FilePropertiesMenu(Bar& menu)
menu.MenuSeparator();
menu.Add(IsActiveFile(), AK_FILEPROPERTIES, THISBACK(FileProperties))
.Help("File properties stored in package");
menu.Add(IsActiveFile(), AK_SAVEENCODING, THISBACK(ChangeCharset))
menu.Add(IsActiveFile() && !designer, AK_SAVEENCODING, THISBACK(ChangeCharset))
.Help("Convert actual file to different encoding");
menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_DIFF, IdeImg::Diff(), THISBACK(Diff))
menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_DIFF, IdeImg::Diff(), THISBACK(Diff))
.Help("Show differences between the project and arbitrary files");
menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_PATCH, IdeImg::Patch(), THISBACK(Patch))
menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_PATCH, IdeImg::Patch(), THISBACK(Patch))
.Help("Show differences with patch file applied");
if(IsSvnDir(GetFileFolder(editfile)))
menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
.Help("Show svn history of file");
}