projects
/
synfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe532b5
)
Remove ugly hacks for panels sizes and positions
author
Carlos Lopez
<genetita@gmail.com>
Wed, 5 May 2010 18:51:38 +0000
(20:51 +0200)
committer
Carlos Lopez
<genetita@gmail.com>
Wed, 5 May 2010 18:51:38 +0000
(20:51 +0200)
synfig-studio/src/gtkmm/dockmanager.cpp
patch
|
blob
|
history
diff --git
a/synfig-studio/src/gtkmm/dockmanager.cpp
b/synfig-studio/src/gtkmm/dockmanager.cpp
index
8a5198c
..
1fdd439
100644
(file)
--- a/
synfig-studio/src/gtkmm/dockmanager.cpp
+++ b/
synfig-studio/src/gtkmm/dockmanager.cpp
@@
-67,11
+67,8
@@
public:
{
synfigapp::Main::settings().remove_domain("dock");
}
{
synfigapp::Main::settings().remove_domain("dock");
}
-#define SCALE_FACTOR (1280)
virtual bool get_value(const synfig::String& key_, synfig::String& value)const
{
virtual bool get_value(const synfig::String& key_, synfig::String& value)const
{
- int screen_w(Gdk::screen_width());
- int screen_h(Gdk::screen_height());
if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")try
{
if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")try
{
@@
-89,19
+86,19
@@
public:
vector<int>::const_iterator end(dock_dialog.get_dock_book_sizes().end());
value.clear();
for(;iter!=end;++iter)
vector<int>::const_iterator end(dock_dialog.get_dock_book_sizes().end());
value.clear();
for(;iter!=end;++iter)
- value+=strprintf("%d ",
(*iter)*SCALE_FACTOR/screen_h
);
+ value+=strprintf("%d ",
*iter
);
return true;
}
if(key=="pos")
{
int x,y; dock_dialog.get_position(x,y);
return true;
}
if(key=="pos")
{
int x,y; dock_dialog.get_position(x,y);
- value=strprintf("%d %d",x
*SCALE_FACTOR/screen_w,y*SCALE_FACTOR/screen_h
);
+ value=strprintf("%d %d",x
,y
);
return true;
}
if(key=="size")
{
int x,y; dock_dialog.get_size(x,y);
return true;
}
if(key=="size")
{
int x,y; dock_dialog.get_size(x,y);
- value=strprintf("%d %d",x
*SCALE_FACTOR/screen_w,y*SCALE_FACTOR/screen_h
);
+ value=strprintf("%d %d",x
,y
);
return true;
}
if(key=="contents")
return true;
}
if(key=="contents")
@@
-120,8
+117,6
@@
public:
virtual bool set_value(const synfig::String& key_,const synfig::String& value)
{
virtual bool set_value(const synfig::String& key_,const synfig::String& value)
{
- int screen_w(Gdk::screen_width());
- int screen_h(Gdk::screen_height());
if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")
{
if(key_.size()>6 && String(key_.begin(),key_.begin()+6)=="dialog")
{
@@
-145,13
+140,6
@@
public:
int size;
if(!strscanf(value_,"%d",&size))
break;
int size;
if(!strscanf(value_,"%d",&size))
break;
- if (size > SCALE_FACTOR) size = SCALE_FACTOR - 150;
- if (size < 0) size = 0;
- size=size*screen_h/SCALE_FACTOR;
-
- // prevent errors like this, by allowing space for at least the dockable's icon:
- // ** CRITICAL **: clearlooks_style_draw_box_gap: assertion `height >= -1' failed
- if (size < height + 9) size = height + 9;
data.push_back(size);
data.push_back(size);
@@
-174,14
+162,6
@@
public:
int x,y;
if(!strscanf(value,"%d %d",&x, &y))
return false;
int x,y;
if(!strscanf(value,"%d %d",&x, &y))
return false;
- if (x > SCALE_FACTOR) x = SCALE_FACTOR - 150; if (x < 0) x = 0;
- if (y > SCALE_FACTOR) y = SCALE_FACTOR - 150; if (y < 0) y = 0;
- x=x*screen_w/SCALE_FACTOR;
- y=y*screen_h/SCALE_FACTOR;
- if(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"))
- x += atoi(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"));
- if(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"))
- y += atoi(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"));
dock_dialog.move(x,y);
return true;
}
dock_dialog.move(x,y);
return true;
}
@@
-190,10
+170,6
@@
public:
int x,y;
if(!strscanf(value,"%d %d",&x, &y))
return false;
int x,y;
if(!strscanf(value,"%d %d",&x, &y))
return false;
- if (x > SCALE_FACTOR) x = 150; if (x < 0) x = 0;
- if (y > SCALE_FACTOR) y = 150; if (y < 0) y = 0;
- x=x*screen_w/SCALE_FACTOR;
- y=y*screen_h/SCALE_FACTOR;
dock_dialog.set_default_size(x,y);
dock_dialog.resize(x,y);
return true;
dock_dialog.set_default_size(x,y);
dock_dialog.resize(x,y);
return true;