[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3172 - trunk/pingus/src/editor
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3172 - trunk/pingus/src/editor |
Date: |
Mon, 17 Sep 2007 22:36:15 +0200 |
Author: grumbel
Date: 2007-09-17 22:36:14 +0200 (Mon, 17 Sep 2007)
New Revision: 3172
Modified:
trunk/pingus/src/editor/object_properties.cpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/object_selector_set.hpp
Log:
- hooked up stretch_x/y
- save/restore scroll offset in ObjectSelector for different sets
Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp 2007-09-17 20:10:10 UTC
(rev 3171)
+++ trunk/pingus/src/editor/object_properties.cpp 2007-09-17 20:36:14 UTC
(rev 3172)
@@ -336,21 +336,21 @@
ObjectProperties::on_gptype_change(const ComboItem& item)
{
for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
- {
- (*i)->set_type(Groundtype::type_to_string((Groundtype::GPType)item.id));
- }
+ (*i)->set_type(Groundtype::type_to_string((Groundtype::GPType)item.id));
}
void
ObjectProperties::on_stretch_x_change(bool t)
{
- std::cout << "ObjectProperties::on_stretch_x_change: switch to: " << t <<
std::endl;
+ for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
+ (*i)->set_stretch_x(t);
}
void
ObjectProperties::on_stretch_y_change(bool t)
{
- std::cout << "ObjectProperties::on_stretch_y_change: switch to: " << t <<
std::endl;
+ for(Objects::iterator i = objects.begin(); i != objects.end(); ++i)
+ (*i)->set_stretch_y(t);
}
void
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2007-09-17 20:10:10 UTC
(rev 3171)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2007-09-17 20:36:14 UTC
(rev 3172)
@@ -197,9 +197,18 @@
}
void
-ObjectSelectorList::set_objects(ObjectSelectorSet* set_)
+ObjectSelectorList::set_objects(ObjectSelectorSet* new_set)
{
- set = set_;
+ if (set)
+ set->set_offset(offset);
+
+ if (new_set)
+ offset = new_set->get_offset();
+ else
+ offset = 0.0f;
+
+ set = new_set;
+
current_object = -1;
}
Modified: trunk/pingus/src/editor/object_selector_set.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_set.hpp 2007-09-17 20:10:10 UTC
(rev 3171)
+++ trunk/pingus/src/editor/object_selector_set.hpp 2007-09-17 20:36:14 UTC
(rev 3172)
@@ -52,7 +52,7 @@
int get_thumb_height() const { return thumb_size.height; }
float get_offset() const { return offset; }
- void set_offset(float o) { offset = 0; }
+ void set_offset(float o) { offset = o; }
const Objects& get_objects() const { return objects; }
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3172 - trunk/pingus/src/editor,
grumbel at BerliOS <=