mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-25 06:12:47 -06:00
CtrlLib: Ubuntu DarkRoom theme fixes
git-svn-id: svn://ultimatepp.org/upp/trunk@3884 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
aac49b518c
commit
f98caefd1e
4 changed files with 825 additions and 825 deletions
|
|
@ -628,9 +628,9 @@ void ChHostSkin()
|
|||
ChGtkNew(top_item, "menuitem", GTK_BOX);
|
||||
if(gtk_major_version > 2 || (gtk_major_version == 2 && gtk_minor_version >= 1))
|
||||
sw = GtkInt("selected_shadow_type");
|
||||
s.topitemtext[0] = ChGtkColor(0, bar);
|
||||
s.topitemtext[1] = ChGtkColor(1, bar);
|
||||
s.topitemtext[2] = ChGtkColor(2, bar);
|
||||
s.topitemtext[0] = ChGtkColor(0, top_item);
|
||||
s.topitemtext[1] = ChGtkColor(1, top_item);
|
||||
s.topitemtext[2] = ChGtkColor(2, top_item);
|
||||
SColorMenuText_Write(s.topitemtext[1]);
|
||||
s.topitem[1] = s.topitem[0];
|
||||
GtkCh(s.topitem[2], sw, GTK_STATE_PRELIGHT);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2,7 +2,7 @@
|
|||
#define _CtrlLib_icpp_init_stub
|
||||
#include "CtrlCore/init"
|
||||
#include "PdfDraw/init"
|
||||
#define BLITZ_INDEX__ FB9E7B1606F2E477EEF031EF7EBC6EE12
|
||||
#define BLITZ_INDEX__ F682CA52260E08DE87F9D30ACEC11FC17
|
||||
#include "CtrlLib.icpp"
|
||||
#undef BLITZ_INDEX__
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,183 +1,183 @@
|
|||
#include "TabBar.h"
|
||||
|
||||
NAMESPACE_UPP
|
||||
|
||||
String FileTabs::GetFileGroup(const String &file)
|
||||
{
|
||||
return GetFileDirectory(file);
|
||||
}
|
||||
|
||||
String FileTabs::GetStackId(const Tab &a)
|
||||
{
|
||||
String s = a.value;
|
||||
return GetFileTitle(s);
|
||||
}
|
||||
|
||||
unsigned FileTabs::GetStackSortOrder(const Tab &a)
|
||||
{
|
||||
String s = a.value;
|
||||
return GetFileExt(s).GetHashValue();
|
||||
}
|
||||
|
||||
void FileTabs::ComposeTab(Tab& tab, const Font &font, Color ink, int style)
|
||||
{
|
||||
if(PaintIcons() && tab.HasIcon())
|
||||
{
|
||||
tab.AddImage(tab.img);
|
||||
tab.AddSpace(TB_SPACEICON);
|
||||
}
|
||||
|
||||
WString txt = IsString(tab.value) ? tab.value : StdConvert().Format(tab.value);
|
||||
int extpos = txt.ReverseFind('.');
|
||||
tab.AddText(extpos >= 0 ? txt.Left(extpos) : txt, font, filecolor);
|
||||
|
||||
if (extpos >= 0) {
|
||||
tab.AddText(txt.Right(txt.GetLength() - extpos), font, extcolor);
|
||||
}
|
||||
}
|
||||
|
||||
void FileTabs::ComposeStackedTab(Tab& tab, const Tab& stacked_tab, const Font &font, Color ink, int style)
|
||||
{
|
||||
tab.AddImage(TabBarImg::STSEP);
|
||||
|
||||
if (stackedicons && tab.HasIcon()) {
|
||||
tab.AddImage(style == CTRL_HOT ? stacked_tab.img : (greyedicons ? DisabledImage(stacked_tab.img) : stacked_tab.img))
|
||||
.Clickable();
|
||||
}
|
||||
else {
|
||||
WString txt = IsString(stacked_tab.value) ? stacked_tab.value : StdConvert().Format(stacked_tab.value);
|
||||
int extpos = txt.ReverseFind('.');
|
||||
|
||||
Color c = (style == CTRL_HOT) ? extcolor : SColorDisabled();
|
||||
if (extpos >= 0) {
|
||||
tab.AddText(
|
||||
txt.Right(txt.GetLength() - extpos - 1),
|
||||
font,
|
||||
c
|
||||
).Clickable();
|
||||
}
|
||||
else {
|
||||
tab.AddText("-", font, c).Clickable();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Size FileTabs::GetStackedSize(const Tab &t)
|
||||
{
|
||||
if (stackedicons && t.HasIcon())
|
||||
return min(t.img.GetSize(), Size(TB_ICON, TB_ICON)) + Size(TB_SPACEICON, 0) + 5;
|
||||
String s = t.value;
|
||||
s = GetFileExt(s);
|
||||
return GetTextSize(s.ToWString(), GetStyle().font) + Size(TB_SPACEICON, 0);
|
||||
}
|
||||
|
||||
void FileTabs::Serialize(Stream& s)
|
||||
{
|
||||
TabBar::Serialize(s);
|
||||
if(s.IsLoading() && icons)
|
||||
{
|
||||
for(int i = 0; i < tabs.GetCount(); i++)
|
||||
tabs[i].img = NativePathIcon(String(tabs[i].value));
|
||||
}
|
||||
}
|
||||
|
||||
void FileTabs::AddFile(const WString &file, bool make_active)
|
||||
{
|
||||
AddFile(file, NativePathIcon(file.ToString()), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::AddFile(const WString &file, Image img, bool make_active)
|
||||
{
|
||||
InsertFile(GetCount(), file, img, make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFile(int ix, const WString &file, bool make_active)
|
||||
{
|
||||
InsertFile(ix, file, NativePathIcon(file.ToString()), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFile(int ix, const WString &file, Image img, bool make_active)
|
||||
{
|
||||
String s = file.ToString();
|
||||
TabBar::InsertKey(ix, file, GetFileName(s), img, GetFileGroup(s), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::AddFiles(const Vector<String> &files, bool make_active)
|
||||
{
|
||||
AddFiles(files, Vector<Image>(), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::AddFiles(const Vector<String> &files, const Vector<Image> &img, bool make_active)
|
||||
{
|
||||
InsertFiles(GetCount(), files, img, make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFiles(int ix, const Vector<String> &files, bool make_active)
|
||||
{
|
||||
InsertFiles(ix, files, Vector<Image>(), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFiles(int ix, const Vector<String> &files, const Vector<Image> &img, bool make_active)
|
||||
{
|
||||
if (!files.GetCount()) return;
|
||||
bool useimg = img.GetCount() == files.GetCount();
|
||||
for (int i = files.GetCount() - 1; i > 0; i--) {
|
||||
TabBar::InsertKey0(ix, files[i].ToWString(), GetFileName(files[i]),
|
||||
useimg ? img[i] : NativePathIcon(files[i]), GetFileGroup(files[i]));
|
||||
}
|
||||
InsertFile(ix, files[0].ToWString(), useimg ? img[0] : NativePathIcon(files[0]), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::RenameFile(const WString &from, const WString &to, Image icon)
|
||||
{
|
||||
int n = FindKey(from);
|
||||
if (n >= 0)
|
||||
Set(n, to, GetFileName(to.ToString()), IsNull(icon) ? NativePathIcon(to.ToString()) : icon);
|
||||
}
|
||||
|
||||
FileTabs& FileTabs::FileIcons(bool normal, bool stacked, bool stacked_greyedout)
|
||||
{
|
||||
stackedicons = stacked;
|
||||
greyedicons = stacked_greyedout;
|
||||
TabBar::Icons(normal);
|
||||
return *this;
|
||||
}
|
||||
|
||||
Vector<String> FileTabs::GetFiles() const
|
||||
{
|
||||
Vector<String> files;
|
||||
files.SetCount(tabs.GetCount());
|
||||
for (int i = 0; i < tabs.GetCount(); i++)
|
||||
files[i] = tabs[i].key;
|
||||
return files;
|
||||
}
|
||||
|
||||
FileTabs& FileTabs::operator<<(const FileTabs &src)
|
||||
{
|
||||
Clear();
|
||||
Stacking(false);
|
||||
SortGroups(false);
|
||||
Grouping(false);
|
||||
AddFiles(src.GetFiles(), src.GetIcons(), false);
|
||||
CopySettings(src);
|
||||
stackedicons = src.stackedicons;
|
||||
greyedicons = src.greyedicons;
|
||||
|
||||
if (src.HasCursor())
|
||||
SetData(~src);
|
||||
sc.SetPos(src.GetScrollPos());
|
||||
Refresh();
|
||||
return *this;
|
||||
}
|
||||
|
||||
FileTabs::FileTabs() :
|
||||
normalicons(true),
|
||||
stackedicons(false),
|
||||
greyedicons(true),
|
||||
filecolor(SColorText),
|
||||
extcolor(LtBlue)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
END_UPP_NAMESPACE
|
||||
#include "TabBar.h"
|
||||
|
||||
NAMESPACE_UPP
|
||||
|
||||
String FileTabs::GetFileGroup(const String &file)
|
||||
{
|
||||
return GetFileDirectory(file);
|
||||
}
|
||||
|
||||
String FileTabs::GetStackId(const Tab &a)
|
||||
{
|
||||
String s = a.value;
|
||||
return GetFileTitle(s);
|
||||
}
|
||||
|
||||
unsigned FileTabs::GetStackSortOrder(const Tab &a)
|
||||
{
|
||||
String s = a.value;
|
||||
return GetFileExt(s).GetHashValue();
|
||||
}
|
||||
|
||||
void FileTabs::ComposeTab(Tab& tab, const Font &font, Color ink, int style)
|
||||
{
|
||||
if(PaintIcons() && tab.HasIcon())
|
||||
{
|
||||
tab.AddImage(tab.img);
|
||||
tab.AddSpace(TB_SPACEICON);
|
||||
}
|
||||
|
||||
WString txt = IsString(tab.value) ? tab.value : StdConvert().Format(tab.value);
|
||||
int extpos = txt.ReverseFind('.');
|
||||
tab.AddText(extpos >= 0 ? txt.Left(extpos) : txt, font, filecolor);
|
||||
|
||||
if (extpos >= 0) {
|
||||
tab.AddText(txt.Right(txt.GetLength() - extpos), font, extcolor);
|
||||
}
|
||||
}
|
||||
|
||||
void FileTabs::ComposeStackedTab(Tab& tab, const Tab& stacked_tab, const Font &font, Color ink, int style)
|
||||
{
|
||||
tab.AddImage(TabBarImg::STSEP);
|
||||
|
||||
if (stackedicons && tab.HasIcon()) {
|
||||
tab.AddImage(style == CTRL_HOT ? stacked_tab.img : (greyedicons ? DisabledImage(stacked_tab.img) : stacked_tab.img))
|
||||
.Clickable();
|
||||
}
|
||||
else {
|
||||
WString txt = IsString(stacked_tab.value) ? stacked_tab.value : StdConvert().Format(stacked_tab.value);
|
||||
int extpos = txt.ReverseFind('.');
|
||||
|
||||
Color c = (style == CTRL_HOT) ? extcolor : SColorDisabled();
|
||||
if (extpos >= 0) {
|
||||
tab.AddText(
|
||||
txt.Right(txt.GetLength() - extpos - 1),
|
||||
font,
|
||||
c
|
||||
).Clickable();
|
||||
}
|
||||
else {
|
||||
tab.AddText("-", font, c).Clickable();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Size FileTabs::GetStackedSize(const Tab &t)
|
||||
{
|
||||
if (stackedicons && t.HasIcon())
|
||||
return min(t.img.GetSize(), Size(TB_ICON, TB_ICON)) + Size(TB_SPACEICON, 0) + 5;
|
||||
String s = t.value;
|
||||
s = GetFileExt(s);
|
||||
return GetTextSize(s.ToWString(), GetStyle().font) + Size(TB_SPACEICON, 0);
|
||||
}
|
||||
|
||||
void FileTabs::Serialize(Stream& s)
|
||||
{
|
||||
TabBar::Serialize(s);
|
||||
if(s.IsLoading() && icons)
|
||||
{
|
||||
for(int i = 0; i < tabs.GetCount(); i++)
|
||||
tabs[i].img = NativePathIcon(String(tabs[i].value));
|
||||
}
|
||||
}
|
||||
|
||||
void FileTabs::AddFile(const WString &file, bool make_active)
|
||||
{
|
||||
AddFile(file, NativePathIcon(file.ToString()), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::AddFile(const WString &file, Image img, bool make_active)
|
||||
{
|
||||
InsertFile(GetCount(), file, img, make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFile(int ix, const WString &file, bool make_active)
|
||||
{
|
||||
InsertFile(ix, file, NativePathIcon(file.ToString()), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFile(int ix, const WString &file, Image img, bool make_active)
|
||||
{
|
||||
String s = file.ToString();
|
||||
TabBar::InsertKey(ix, file, GetFileName(s), img, GetFileGroup(s), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::AddFiles(const Vector<String> &files, bool make_active)
|
||||
{
|
||||
AddFiles(files, Vector<Image>(), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::AddFiles(const Vector<String> &files, const Vector<Image> &img, bool make_active)
|
||||
{
|
||||
InsertFiles(GetCount(), files, img, make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFiles(int ix, const Vector<String> &files, bool make_active)
|
||||
{
|
||||
InsertFiles(ix, files, Vector<Image>(), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::InsertFiles(int ix, const Vector<String> &files, const Vector<Image> &img, bool make_active)
|
||||
{
|
||||
if (!files.GetCount()) return;
|
||||
bool useimg = img.GetCount() == files.GetCount();
|
||||
for (int i = files.GetCount() - 1; i > 0; i--) {
|
||||
TabBar::InsertKey0(ix, files[i].ToWString(), GetFileName(files[i]),
|
||||
useimg ? img[i] : NativePathIcon(files[i]), GetFileGroup(files[i]));
|
||||
}
|
||||
InsertFile(ix, files[0].ToWString(), useimg ? img[0] : NativePathIcon(files[0]), make_active);
|
||||
}
|
||||
|
||||
void FileTabs::RenameFile(const WString &from, const WString &to, Image icon)
|
||||
{
|
||||
int n = FindKey(from);
|
||||
if (n >= 0)
|
||||
Set(n, to, GetFileName(to.ToString()), IsNull(icon) ? NativePathIcon(to.ToString()) : icon);
|
||||
}
|
||||
|
||||
FileTabs& FileTabs::FileIcons(bool normal, bool stacked, bool stacked_greyedout)
|
||||
{
|
||||
stackedicons = stacked;
|
||||
greyedicons = stacked_greyedout;
|
||||
TabBar::Icons(normal);
|
||||
return *this;
|
||||
}
|
||||
|
||||
Vector<String> FileTabs::GetFiles() const
|
||||
{
|
||||
Vector<String> files;
|
||||
files.SetCount(tabs.GetCount());
|
||||
for (int i = 0; i < tabs.GetCount(); i++)
|
||||
files[i] = tabs[i].key;
|
||||
return files;
|
||||
}
|
||||
|
||||
FileTabs& FileTabs::operator<<(const FileTabs &src)
|
||||
{
|
||||
Clear();
|
||||
Stacking(false);
|
||||
SortGroups(false);
|
||||
Grouping(false);
|
||||
AddFiles(src.GetFiles(), src.GetIcons(), false);
|
||||
CopySettings(src);
|
||||
stackedicons = src.stackedicons;
|
||||
greyedicons = src.greyedicons;
|
||||
|
||||
if (src.HasCursor())
|
||||
SetData(~src);
|
||||
sc.SetPos(src.GetScrollPos());
|
||||
Refresh();
|
||||
return *this;
|
||||
}
|
||||
|
||||
FileTabs::FileTabs() :
|
||||
normalicons(true),
|
||||
stackedicons(false),
|
||||
greyedicons(true),
|
||||
filecolor(SColorLabel),
|
||||
extcolor(IsDark(SColorFace()) ? Blend(White, LtBlue) : LtBlue)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
END_UPP_NAMESPACE
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue